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

added to DetectorExtractor test the check of compute() on empty data. Added test for BRIEF.

Browse Source
This commit is contained in:
Maria Dimashova
2010-11-24 16:03:11 +00:00
parent 43716f31b9
commit 0a2881adcd
3 changed files with 138 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2109,8 +2109,7 @@ inline void BruteForceMatcher<Distance>::commonKnnMatchImpl( BruteForceMatcher<D
size_t imgCount = matcher.trainDescCollection.size();
vector<Mat> allDists( imgCount ); // distances between one query descriptor and all train descriptors
for( size_t i = 0; i < imgCount; i++ )
if( matcher.trainDescCollection[i].rows )
allDists[i] = Mat( 1, matcher.trainDescCollection[i].rows, DataType<DistanceType>::type );
allDists[i] = Mat( 1, matcher.trainDescCollection[i].rows, DataType<DistanceType>::type );
for( int qIdx = 0; qIdx < queryDescriptors.rows; qIdx++ )
{

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

@@ -358,7 +358,7 @@ Ptr<DescriptorExtractor> createDescriptorExtractor(const string& descriptorExtra
}
else if (!descriptorExtractorType.compare("BRIEF"))
{
de = new BriefDescriptorExtractor(32);
de = new BriefDescriptorExtractor();
}
return de;
}