fixed FernDescriptorMatch; optimized keypoint regions matching in…

fixed FernDescriptorMatch; optimized keypoint regions matching in detector/descriptor evaluation; added CalonderDescriptorExtractor to evaluation tests

modules/features2d/include/opencv2/features2d/features2d.hpp

@@ -2128,7 +2128,8 @@ protected:
     Params params;
 };
 
-CV_EXPORTS Ptr<GenericDescriptorMatch> createGenericDescriptorMatch( const string& genericDescritptorMatchType, const string &paramsFilename = string () );
+CV_EXPORTS Ptr<GenericDescriptorMatch> createGenericDescriptorMatcher( const string& genericDescritptorMatcherType,
+                                                                       const string &paramsFilename = string () );
 
 /****************************************************************************************\
 *                                VectorDescriptorMatch                                   *

modules/features2d/src/matchers.cpp

@@ -569,7 +569,7 @@ void FernDescriptorMatch::trainFernClassifier()
     {
         assert( params.filename.empty() );
 
-        vector<vector<Point2f> > points;
+        vector<vector<Point2f> > points(collection.images.size());
         for( size_t imgIdx = 0; imgIdx < collection.images.size(); imgIdx++ )
             KeyPoint::convert( collection.points[imgIdx], points[imgIdx] );
 
@@ -757,34 +757,34 @@ void VectorDescriptorMatch::write (FileStorage& fs) const
 /****************************************************************************************\
 *                Factory function for GenericDescriptorMatch creating                    *
 \****************************************************************************************/
-Ptr<GenericDescriptorMatch> createGenericDescriptorMatch( const string& genericDescritptorMatchType,
-                                                          const string &paramsFilename )
+Ptr<GenericDescriptorMatch> createGenericDescriptorMatcher( const string& genericDescritptorMatcherType,
+                                                            const string &paramsFilename )
 {
-    GenericDescriptorMatch *descriptorMatch = 0;
-    if( ! genericDescritptorMatchType.compare("ONEWAY") )
+    GenericDescriptorMatch *descriptorMatcher = 0;
+    if( ! genericDescritptorMatcherType.compare("ONEWAY") )
     {
-        descriptorMatch = new OneWayDescriptorMatch();
+        descriptorMatcher = new OneWayDescriptorMatch();
     }
-    else if( ! genericDescritptorMatchType.compare("FERN") )
+    else if( ! genericDescritptorMatcherType.compare("FERN") )
     {
-        descriptorMatch = new FernDescriptorMatch();
+        descriptorMatcher = new FernDescriptorMatch();
     }
-    else if( ! genericDescritptorMatchType.compare ("CALONDER") )
+    else if( ! genericDescritptorMatcherType.compare ("CALONDER") )
     {
         //descriptorMatch = new CalonderDescriptorMatch ();
     }
 
-    if( !paramsFilename.empty() && descriptorMatch != 0 )
+    if( !paramsFilename.empty() && descriptorMatcher != 0 )
     {
         FileStorage fs = FileStorage( paramsFilename, FileStorage::READ );
         if( fs.isOpened() )
         {
-            descriptorMatch->read( fs.root() );
+            descriptorMatcher->read( fs.root() );
             fs.release();
         }
     }
 
-    return descriptorMatch;
+    return descriptorMatcher;
 }
 
 }

samples/cpp/generic_descriptor_match.cpp

@@ -24,8 +24,8 @@ int main(int argc, char** argv)
     std::string alg_name = std::string(argv[3]);
     std::string params_filename = std::string(argv[4]);
 
-    GenericDescriptorMatch *descriptorMatch = createGenericDescriptorMatch(alg_name, params_filename);
-    if( descriptorMatch == 0 )
+    GenericDescriptorMatch *descriptorMatcher = createGenericDescriptorMatcher(alg_name, params_filename);
+    if( descriptorMatcher == 0 )
     {
         printf ("Cannot create descriptor\n");
         return 0;
@@ -50,10 +50,10 @@ int main(int argc, char** argv)
 
     printf("Finding nearest neighbors... \n");
     // find NN for each of keypoints2 in keypoints1
-    descriptorMatch->add( img1, keypoints1 );
+    descriptorMatcher->add( img1, keypoints1 );
     vector<int> matches2to1;
     matches2to1.resize(keypoints2.size());
-    descriptorMatch->match( img2, keypoints2, matches2to1 );
+    descriptorMatcher->match( img2, keypoints2, matches2to1 );
     printf("Done\n");
 
     IplImage* img_corr = DrawCorrespondences(img1, keypoints1, img2, keypoints2, matches2to1);
@@ -65,7 +65,7 @@ int main(int argc, char** argv)
     cvReleaseImage(&img1);
     cvReleaseImage(&img2);
     cvReleaseImage(&img_corr);
-    delete descriptorMatch;
+    delete descriptorMatcher;
 }
 
 IplImage* DrawCorrespondences(IplImage* img1, const vector<KeyPoint>& features1, IplImage* img2,