generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed compile error; renamed createDescriptorMatch to createGenericDescriptorMatch

Browse Source
This commit is contained in:
Maria Dimashova 2010-06-28 16:03:01 +00:00
parent add94f9bd6
commit 69adf86afe
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/features2d/include/opencv2/features2d/features2d.hpp
View File

@ -1470,7 +1470,7 @@ protected:
SURF surf; SURF surf;
}; };
DescriptorExtractor* createDescriptorExtractor( const string& descriptorExtractorType ); CV_EXPORTS DescriptorExtractor* createDescriptorExtractor( const string& descriptorExtractorType );
/****************************************************************************************\ /****************************************************************************************\
* Distance * * 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 * * GenericDescriptorMatch *
@ -2170,7 +2170,7 @@ protected:
Params params; Params params;
}; };
GenericDescriptorMatch* createDescriptorMatch( const string& genericDescritptorMatchType, const string &paramsFilename = string () ); CV_EXPORTS GenericDescriptorMatch* createGenericDescriptorMatch( const string& genericDescritptorMatchType, const string &paramsFilename = string () );
/****************************************************************************************\ /****************************************************************************************\
* VectorDescriptorMatch * * VectorDescriptorMatch *
\****************************************************************************************/ \****************************************************************************************/

3
modules/features2d/src/descriptors.cpp
View File

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

11
samples/cpp/generic_descriptor_match.cpp
View File

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

4
tests/cv/src/adetectordescriptor_evaluation.cpp
View File

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