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

features2d: workaround for 'utrainDescCollection' issue (PR #2142)

Browse Source
This commit is contained in:
Alexander Alekhin 2014-03-12 15:54:55 +04:00 committed by Andrey Pavlenko
parent 1d9808e5d5
commit 89e3e448f5
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/features2d/src/matchers.cpp
View File

@ -1232,6 +1232,13 @@ void FlannBasedMatcher::train()
{ {
if( !flannIndex || mergedDescriptors.size() < addedDescCount ) if( !flannIndex || mergedDescriptors.size() < addedDescCount )
{ {
// FIXIT: Workaround for 'utrainDescCollection' issue (PR #2142)
if (!utrainDescCollection.empty())
{
CV_Assert(trainDescCollection.size() == 0);
for (size_t i = 0; i < utrainDescCollection.size(); ++i)
trainDescCollection.push_back(utrainDescCollection[i].getMat(ACCESS_READ));
}
mergedDescriptors.set( trainDescCollection ); mergedDescriptors.set( trainDescCollection );
flannIndex = makePtr<flann::Index>( mergedDescriptors.getDescriptors(), *indexParams ); flannIndex = makePtr<flann::Index>( mergedDescriptors.getDescriptors(), *indexParams );
} }