merged regression tests for FeatureDetector, DescriptorExtractor from branch .features2d;

renamed createDetector to createFeatureDetector
2010-09-17 11:26:58 +00:00
parent eab003d06e
commit 8ab3fdbcca
6 changed files with 340 additions and 6 deletions
--- a/modules/features2d/include/opencv2/features2d/features2d.hpp
+++ b/modules/features2d/include/opencv2/features2d/features2d.hpp
@@ -1354,7 +1354,7 @@ protected:
    SURF surf;
 };

-CV_EXPORTS Ptr<FeatureDetector> createDetector( const string& detectorType );
+CV_EXPORTS Ptr<FeatureDetector> createFeatureDetector( const string& detectorType );

 /*
 * Adapts a detector to partition the source image into a grid and detect