generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray

Browse Source
This commit is contained in:
Andrey Pavlenko
2014-02-06 12:55:04 +04:00
committed by OpenCV Buildbot
parent 721d0145e0 bdfa9fa14a
commit b6675ee2a8
23 changed files with 217 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/nonfree/include/opencv2/nonfree/features2d.hpp
View File

@@ -88,7 +88,7 @@ public:
protected:
void detectImpl( InputArray image, std::vector<KeyPoint>& keypoints, InputArray mask = noArray() ) const;
void computeImpl( const Mat& image, std::vector<KeyPoint>& keypoints, Mat& descriptors ) const;
void computeImpl( InputArray image, std::vector<KeyPoint>& keypoints, OutputArray descriptors ) const;
CV_PROP_RW int nfeatures;
CV_PROP_RW int nOctaveLayers;
@@ -143,7 +143,7 @@ public:
protected:
void detectImpl( InputArray image, std::vector<KeyPoint>& keypoints, InputArray mask = noArray() ) const;
void computeImpl( const Mat& image, std::vector<KeyPoint>& keypoints, Mat& descriptors ) const;
void computeImpl( InputArray image, std::vector<KeyPoint>& keypoints, OutputArray descriptors ) const;
};
typedef SURF SurfFeatureDetector;