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

Trying to fix flann python wrapper issue

Browse Source
This commit is contained in:
Maksim Shabunin 2015-06-10 13:00:36 +03:00
parent 424c2bddb3
commit 26d9a7cd40
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1022,12 +1022,27 @@ FlannBasedMatcher::FlannBasedMatcher( const Ptr<flann::IndexParams>& _indexParam
void FlannBasedMatcher::add( InputArrayOfArrays _descriptors ) void FlannBasedMatcher::add( InputArrayOfArrays _descriptors )
{ {
DescriptorMatcher::add( _descriptors ); DescriptorMatcher::add( _descriptors );
std::vector<UMat> descriptors; if(_descriptors.isUMatVector() || _descriptors.isUMat())
_descriptors.getUMatVector(descriptors);
for( size_t i = 0; i < descriptors.size(); i++ )
{ {
addedDescCount += descriptors[i].rows; std::vector<UMat> descriptors;
_descriptors.getUMatVector(descriptors);
for( size_t i = 0; i < descriptors.size(); i++ )
{
addedDescCount += descriptors[i].rows;
}
}
else if(_descriptors.isMatVector() || _descriptors.isMat())
{
std::vector<Mat> descriptors;
_descriptors.getMatVector(descriptors);
for( size_t i = 0; i < descriptors.size(); i++ )
{
addedDescCount += descriptors[i].rows;
}
}
else
{
CV_Assert( _descriptors.isUMat() || _descriptors.isUMatVector() || _descriptors.isMat() || _descriptors.isMatVector());
} }
} }