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

renamed createDetector to createFeatureDetector

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

modules/features2d/src/detectors.cpp

@@ -316,7 +316,7 @@ void SurfFeatureDetector::detectImpl( const Mat& image, const Mat& mask,
     surf(image, mask, keypoints);
 }
 
-Ptr<FeatureDetector> createDetector( const string& detectorType )
+Ptr<FeatureDetector> createFeatureDetector( const string& detectorType )
 {
     FeatureDetector* fd = 0;
     if( !detectorType.compare( "FAST" ) )

samples/cpp/build3dmodel.cpp

@@ -651,7 +651,7 @@ int main(int argc, char** argv)
     Size calibratedImageSize;
     readCameraMatrix(intrinsicsFilename, cameraMatrix, distCoeffs, calibratedImageSize);
     
-    Ptr<FeatureDetector> detector = createDetector(detectorName);
+    Ptr<FeatureDetector> detector = createFeatureDetector(detectorName);
     Ptr<DescriptorExtractor> descriptorExtractor = createDescriptorExtractor(descriptorExtractorName);
     
     string modelIndexFilename = format("%s_segm/frame_index.yml", modelName);

samples/cpp/descriptor_extractor_matcher.cpp

@@ -143,7 +143,7 @@ int main(int argc, char** argv)
         ransacReprojThreshold = atof(argv[5]);
 
     cout << "< Creating detector, descriptor extractor and descriptor matcher ..." << endl;
-    Ptr<FeatureDetector> detector = createDetector( argv[1] );
+    Ptr<FeatureDetector> detector = createFeatureDetector( argv[1] );
     Ptr<DescriptorExtractor> descriptorExtractor = createDescriptorExtractor( argv[2] );
     Ptr<DescriptorMatcher> descriptorMatcher = createDescriptorMatcher( "BruteForce" );
     cout << ">" << endl;

tests/cv/src/adetectordescriptor_evaluation.cpp

@@ -686,8 +686,8 @@ inline void readKeypoints( FileStorage& fs, vector<KeyPoint>& keypoints, int img
 
 void DetectorQualityTest::readAlgorithm ()
 {
-    defaultDetector = createDetector( algName );
-    specificDetector = createDetector( algName );
+    defaultDetector = createFeatureDetector( algName );
+    specificDetector = createFeatureDetector( algName );
     if( defaultDetector == 0 )
     {
         ts->printf(CvTS::LOG, "Algorithm can not be read\n");