From df1ca974ca3e6c60cc21437d7f24401964ea0a02 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Tue, 5 Jun 2012 08:37:16 +0000 Subject: [PATCH] made GPU Feature Extractor download/convertKeypoints() methods static (Feature #2007) --- modules/gpu/include/opencv2/gpu/gpu.hpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp index 391c1f7c7..43b02a8c9 100644 --- a/modules/gpu/include/opencv2/gpu/gpu.hpp +++ b/modules/gpu/include/opencv2/gpu/gpu.hpp @@ -1449,12 +1449,12 @@ public: int descriptorSize() const; //! upload host keypoints to device memory - void uploadKeypoints(const vector& keypoints, GpuMat& keypointsGPU); + static void uploadKeypoints(const vector& keypoints, GpuMat& keypointsGPU); //! download keypoints from device to host memory - void downloadKeypoints(const GpuMat& keypointsGPU, vector& keypoints); + static void downloadKeypoints(const GpuMat& keypointsGPU, vector& keypoints); //! download descriptors from device to host memory - void downloadDescriptors(const GpuMat& descriptorsGPU, vector& descriptors); + static void downloadDescriptors(const GpuMat& descriptorsGPU, vector& descriptors); //! finds the keypoints using fast hessian detector used in SURF //! supports CV_8UC1 images @@ -1521,10 +1521,10 @@ public: void operator ()(const GpuMat& image, const GpuMat& mask, std::vector& keypoints); //! download keypoints from device to host memory - void downloadKeypoints(const GpuMat& d_keypoints, std::vector& keypoints); + static void downloadKeypoints(const GpuMat& d_keypoints, std::vector& keypoints); //! convert keypoints to KeyPoint vector - void convertKeypoints(const Mat& h_keypoints, std::vector& keypoints); + static void convertKeypoints(const Mat& h_keypoints, std::vector& keypoints); //! release temporary buffer's memory void release(); @@ -1595,10 +1595,9 @@ public: void operator()(const GpuMat& image, const GpuMat& mask, GpuMat& keypoints, GpuMat& descriptors); //! download keypoints from device to host memory - void downloadKeyPoints(GpuMat& d_keypoints, std::vector& keypoints); - + static void downloadKeyPoints(GpuMat& d_keypoints, std::vector& keypoints); //! convert keypoints to KeyPoint vector - void convertKeyPoints(Mat& d_keypoints, std::vector& keypoints); + static void convertKeyPoints(Mat& d_keypoints, std::vector& keypoints); //! returns the descriptor size in bytes inline int descriptorSize() const { return kBytes; }