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

Fix binary compatibility of opencv_features2d

Browse Source
This commit is contained in:
Andrey Kamaev
2012-10-15 21:09:24 +04:00
parent 88e9a072ec
commit 5a730d09cd
7 changed files with 52 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/features2d/include/opencv2/features2d/features2d.hpp
View File

@@ -566,19 +566,19 @@ protected:
CV_EXPORTS void FAST( InputArray image, CV_OUT vector<KeyPoint>& keypoints,
int threshold, bool nonmaxSupression=true );
CV_EXPORTS void FAST( InputArray image, CV_OUT vector<KeyPoint>& keypoints,
CV_EXPORTS void FASTX( InputArray image, CV_OUT vector<KeyPoint>& keypoints,
int threshold, bool nonmaxSupression, int type );
class CV_EXPORTS_W FastFeatureDetector : public FeatureDetector
{
public:
enum
{
{ // Define it in old class to simplify migration to 2.5
TYPE_5_8 = 0, TYPE_7_12 = 1, TYPE_9_16 = 2
};
CV_WRAP FastFeatureDetector( int threshold=10, bool nonmaxSuppression=true);
CV_WRAP FastFeatureDetector( int threshold, bool nonmaxSuppression, int type);
CV_WRAP FastFeatureDetector( int threshold=10, bool nonmaxSuppression=true );
AlgorithmInfo* info() const;
protected:
@@ -586,7 +586,6 @@ protected:
int threshold;
bool nonmaxSuppression;
short type;
};