提交 df1ca974 编写于 作者: V Vladislav Vinogradov

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

上级 40c779fc
...@@ -1449,12 +1449,12 @@ public: ...@@ -1449,12 +1449,12 @@ public:
int descriptorSize() const; int descriptorSize() const;
//! upload host keypoints to device memory //! upload host keypoints to device memory
void uploadKeypoints(const vector<KeyPoint>& keypoints, GpuMat& keypointsGPU); static void uploadKeypoints(const vector<KeyPoint>& keypoints, GpuMat& keypointsGPU);
//! download keypoints from device to host memory //! download keypoints from device to host memory
void downloadKeypoints(const GpuMat& keypointsGPU, vector<KeyPoint>& keypoints); static void downloadKeypoints(const GpuMat& keypointsGPU, vector<KeyPoint>& keypoints);
//! download descriptors from device to host memory //! download descriptors from device to host memory
void downloadDescriptors(const GpuMat& descriptorsGPU, vector<float>& descriptors); static void downloadDescriptors(const GpuMat& descriptorsGPU, vector<float>& descriptors);
//! finds the keypoints using fast hessian detector used in SURF //! finds the keypoints using fast hessian detector used in SURF
//! supports CV_8UC1 images //! supports CV_8UC1 images
...@@ -1521,10 +1521,10 @@ public: ...@@ -1521,10 +1521,10 @@ public:
void operator ()(const GpuMat& image, const GpuMat& mask, std::vector<KeyPoint>& keypoints); void operator ()(const GpuMat& image, const GpuMat& mask, std::vector<KeyPoint>& keypoints);
//! download keypoints from device to host memory //! download keypoints from device to host memory
void downloadKeypoints(const GpuMat& d_keypoints, std::vector<KeyPoint>& keypoints); static void downloadKeypoints(const GpuMat& d_keypoints, std::vector<KeyPoint>& keypoints);
//! convert keypoints to KeyPoint vector //! convert keypoints to KeyPoint vector
void convertKeypoints(const Mat& h_keypoints, std::vector<KeyPoint>& keypoints); static void convertKeypoints(const Mat& h_keypoints, std::vector<KeyPoint>& keypoints);
//! release temporary buffer's memory //! release temporary buffer's memory
void release(); void release();
...@@ -1595,10 +1595,9 @@ public: ...@@ -1595,10 +1595,9 @@ public:
void operator()(const GpuMat& image, const GpuMat& mask, GpuMat& keypoints, GpuMat& descriptors); void operator()(const GpuMat& image, const GpuMat& mask, GpuMat& keypoints, GpuMat& descriptors);
//! download keypoints from device to host memory //! download keypoints from device to host memory
void downloadKeyPoints(GpuMat& d_keypoints, std::vector<KeyPoint>& keypoints); static void downloadKeyPoints(GpuMat& d_keypoints, std::vector<KeyPoint>& keypoints);
//! convert keypoints to KeyPoint vector //! convert keypoints to KeyPoint vector
void convertKeyPoints(Mat& d_keypoints, std::vector<KeyPoint>& keypoints); static void convertKeyPoints(Mat& d_keypoints, std::vector<KeyPoint>& keypoints);
//! returns the descriptor size in bytes //! returns the descriptor size in bytes
inline int descriptorSize() const { return kBytes; } inline int descriptorSize() const { return kBytes; }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册