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

Moved detector and descriptor class factory functions into features2d module

Browse Source
This commit is contained in:
Victor Erukhimov
2010-06-11 18:44:22 +00:00
parent d7691f6cad
commit c6750a0f45
4 changed files with 95 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,9 +42,10 @@
#include "precomp.hpp"
using namespace std;
using namespace cv;
namespace cv
{
CV_EXPORTS void cv::drawMatches( const Mat& img1, const Mat& img2,
CV_EXPORTS void drawMatches( const Mat& img1, const Mat& img2,
const vector<KeyPoint>& keypoints1, const vector<KeyPoint>& keypoints2,
const vector<int>& matches, const vector<char>& mask, Mat& outImg,
const Scalar& matchColor, const Scalar& singlePointColor,
@@ -221,6 +222,45 @@ void SurfDescriptorExtractor::write( FileStorage &fs ) const
fs << "extended" << surf.extended;
}
DescriptorExtractor* createDescriptorExtractor( const string& descriptorExtractorType )
{
DescriptorExtractor* de = 0;
if( !descriptorExtractorType.compare( "SIFT" ) )
{
de = new SiftDescriptorExtractor/*( double magnification=SIFT::DescriptorParams::GET_DEFAULT_MAGNIFICATION(),
bool isNormalize=true, bool recalculateAngles=true,
int nOctaves=SIFT::CommonParams::DEFAULT_NOCTAVES,
int nOctaveLayers=SIFT::CommonParams::DEFAULT_NOCTAVE_LAYERS,
int firstOctave=SIFT::CommonParams::DEFAULT_FIRST_OCTAVE,
int angleMode=SIFT::CommonParams::FIRST_ANGLE )*/;
}
else if( !descriptorExtractorType.compare( "SURF" ) )
{
de = new SurfDescriptorExtractor/*( int nOctaves=4, int nOctaveLayers=2, bool extended=false )*/;
}
else
{
//CV_Error( CV_StsBadArg, "unsupported descriptor extractor type");
}
return de;
}
DescriptorMatcher* createDescriptorMatcher( const string& descriptorMatcherType )
{
DescriptorMatcher* dm = 0;
if( !descriptorMatcherType.compare( "BruteForce" ) )
{
dm = new BruteForceMatcher<L2<float> >();
}
else
{
//CV_Error( CV_StsBadArg, "unsupported descriptor matcher type");
}
return dm;
}
/****************************************************************************************\
* GenericDescriptorMatch *
\****************************************************************************************/
@@ -764,3 +804,5 @@ void FernDescriptorMatch::clear ()
GenericDescriptorMatch::clear();
classifier.release();
}
}