fixed compile error; renamed createDescriptorMatch to createGenericDescriptorMatch

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

@@ -1470,7 +1470,7 @@ protected:
     SURF surf;
 };
 
-DescriptorExtractor* createDescriptorExtractor( const string& descriptorExtractorType );
+CV_EXPORTS DescriptorExtractor* createDescriptorExtractor( const string& descriptorExtractorType );
 
 /****************************************************************************************\
 *                                          Distance                                      *
@@ -1873,7 +1873,7 @@ void BruteForceMatcher<Distance>::matchImpl( const Mat& descriptors_1, const Mat
 }
 
 
-DescriptorMatcher* createDescriptorMatcher( const string& descriptorMatcherType );
+CV_EXPORTS DescriptorMatcher* createDescriptorMatcher( const string& descriptorMatcherType );
 
 /****************************************************************************************\
 *                                GenericDescriptorMatch                                  *
@@ -2170,7 +2170,7 @@ protected:
     Params params;
 };
 
-GenericDescriptorMatch* createDescriptorMatch( const string& genericDescritptorMatchType, const string &paramsFilename = string () );
+CV_EXPORTS GenericDescriptorMatch* createGenericDescriptorMatch( const string& genericDescritptorMatchType, const string &paramsFilename = string () );
 /****************************************************************************************\
 *                                VectorDescriptorMatch                                   *
 \****************************************************************************************/

modules/features2d/src/descriptors.cpp

@@ -40,7 +40,6 @@
 //M*/
 
 #include "precomp.hpp"
-#include <stdio.h>
 
 //#define _KDTREE
 
@@ -335,7 +334,7 @@ void GenericDescriptorMatch::clear()
     collection.clear();
 }
 
-GenericDescriptorMatch* createDescriptorMatch( const string& genericDescritptorMatchType, const string &paramsFilename )
+GenericDescriptorMatch* createGenericDescriptorMatch( const string& genericDescritptorMatchType, const string &paramsFilename )
 {
     GenericDescriptorMatch *descriptorMatch = 0;
     if( ! genericDescritptorMatchType.compare ("ONEWAY") )

samples/cpp/generic_descriptor_match.cpp

-#include <cv.h>
-#include <cvaux.h>
+#include "opencv2/core/core.hpp"
+#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/features2d/features2d.hpp"
 #include <highgui.h>
-
-#include <string>
+#include <cstdio>
 
 using namespace cv;
 
@@ -23,7 +24,7 @@ int main(int argc, char** argv)
     std::string alg_name = std::string(argv[3]);
     std::string params_filename = std::string(argv[4]);
 
-    GenericDescriptorMatch *descriptorMatch = GenericDescriptorMatch::CreateDescriptorMatch (alg_name, params_filename);
+    GenericDescriptorMatch *descriptorMatch = createGenericDescriptorMatch(alg_name, params_filename);
     if( descriptorMatch == 0 )
     {
         printf ("Cannot create descriptor\n");

tests/cv/src/adetectordescriptor_evaluation.cpp

@@ -1325,8 +1325,8 @@ void DescriptorQualityTest::writePlotData( int di ) const
 
 void DescriptorQualityTest::readAlgorithm( )
 {
-    defaultDescMatch = createDescriptorMatch( algName );
-    specificDescMatch = createDescriptorMatch( algName );
+    defaultDescMatch = createGenericDescriptorMatch( algName );
+    specificDescMatch = createGenericDescriptorMatch( algName );
 
     if( defaultDescMatch == 0 )
     {