made GPU Feature Extractor download/convertKeypoints() methods static (Feature #2007)

diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp
index 391c1f7..43b02a8 100644 (file)
--- a/modules/gpu/include/opencv2/gpu/gpu.hpp
+++ b/modules/gpu/include/opencv2/gpu/gpu.hpp
@@ -1449,12 +1449,12 @@ public:
     int descriptorSize() const;\r
 \r
     //! upload host keypoints to device memory\r
-    void uploadKeypoints(const vector<KeyPoint>& keypoints, GpuMat& keypointsGPU);\r
+    static void uploadKeypoints(const vector<KeyPoint>& keypoints, GpuMat& keypointsGPU);\r
     //! download keypoints from device to host memory\r
-    void downloadKeypoints(const GpuMat& keypointsGPU, vector<KeyPoint>& keypoints);\r
+    static void downloadKeypoints(const GpuMat& keypointsGPU, vector<KeyPoint>& keypoints);\r
 \r
     //! download descriptors from device to host memory\r
-    void downloadDescriptors(const GpuMat& descriptorsGPU, vector<float>& descriptors);\r
+    static void downloadDescriptors(const GpuMat& descriptorsGPU, vector<float>& descriptors);\r
 \r
     //! finds the keypoints using fast hessian detector used in SURF\r
     //! supports CV_8UC1 images\r
@@ -1521,10 +1521,10 @@ public:
     void operator ()(const GpuMat& image, const GpuMat& mask, std::vector<KeyPoint>& keypoints);\r
 \r
     //! download keypoints from device to host memory\r
-    void downloadKeypoints(const GpuMat& d_keypoints, std::vector<KeyPoint>& keypoints);\r
+    static void downloadKeypoints(const GpuMat& d_keypoints, std::vector<KeyPoint>& keypoints);\r
 \r
     //! convert keypoints to KeyPoint vector\r
-    void convertKeypoints(const Mat& h_keypoints, std::vector<KeyPoint>& keypoints);\r
+    static void convertKeypoints(const Mat& h_keypoints, std::vector<KeyPoint>& keypoints);\r
 \r
     //! release temporary buffer's memory\r
     void release();\r
@@ -1595,10 +1595,9 @@ public:
     void operator()(const GpuMat& image, const GpuMat& mask, GpuMat& keypoints, GpuMat& descriptors);\r
 \r
     //! download keypoints from device to host memory\r
-    void downloadKeyPoints(GpuMat& d_keypoints, std::vector<KeyPoint>& keypoints);\r
-\r
+    static void downloadKeyPoints(GpuMat& d_keypoints, std::vector<KeyPoint>& keypoints);\r
     //! convert keypoints to KeyPoint vector\r
-    void convertKeyPoints(Mat& d_keypoints, std::vector<KeyPoint>& keypoints);\r
+    static void convertKeyPoints(Mat& d_keypoints, std::vector<KeyPoint>& keypoints);\r
 \r
     //! returns the descriptor size in bytes\r
     inline int descriptorSize() const { return kBytes; }\r