Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts: modules/features2d/include/opencv2/features2d/features2d.hpp modules/ocl/src/opencl/stereobp.cl modules/ocl/src/stereobp.cpp
This commit is contained in:
@@ -535,11 +535,11 @@ protected:
|
||||
};
|
||||
|
||||
|
||||
class CV_EXPORTS GFTTDetector : public FeatureDetector
|
||||
class CV_EXPORTS_W GFTTDetector : public FeatureDetector
|
||||
{
|
||||
public:
|
||||
GFTTDetector( int maxCorners=1000, double qualityLevel=0.01, double minDistance=1,
|
||||
int blockSize=3, bool useHarrisDetector=false, double k=0.04 );
|
||||
CV_WRAP GFTTDetector( int maxCorners=1000, double qualityLevel=0.01, double minDistance=1,
|
||||
int blockSize=3, bool useHarrisDetector=false, double k=0.04 );
|
||||
AlgorithmInfo* info() const;
|
||||
|
||||
protected:
|
||||
|
Reference in New Issue
Block a user