potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages 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
Download Patch File Download Diff File Expand all files Collapse all files
modules/features2d/include/opencv2/features2d/features2d.hpp
+3 -3
View File
@@ -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
+1 -2
View File
@@ -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") )