added improved ORB implementation, convex-convex polygon intersection, eigen2x2 low-level function ...

This commit is contained in:
Vadim Pisarevsky
2011-11-08 12:01:49 +00:00
parent 5a702d7d9d
commit 2e9f5c434b
18 changed files with 1518 additions and 1144 deletions

View File

@@ -340,10 +340,20 @@ Ptr<DescriptorMatcher> DescriptorMatcher::create( const string& descriptorMatche
{
dm = new BruteForceMatcher<Hamming>();
}
else if( !descriptorMatcherType.compare( "BruteForce-HammingLUT") )
else if( !descriptorMatcherType.compare("BruteForce-HammingLUT") )
{
dm = new BruteForceMatcher<Hamming>();
}
else if( !descriptorMatcherType.compare("BruteForce-Hamming(2)") )
{
dm = new BruteForceMatcher<HammingMultilevel<2> >();
}
else if( !descriptorMatcherType.compare("BruteForce-Hamming(4)") )
{
dm = new BruteForceMatcher<HammingMultilevel<4> >();
}
else
CV_Error( CV_StsBadArg, "Unknown matcher name" );
return dm;
}