Commit 26d9a7cd authored by Maksim Shabunin's avatar Maksim Shabunin

Trying to fix flann python wrapper issue

parent 424c2bdd
...@@ -1022,13 +1022,28 @@ FlannBasedMatcher::FlannBasedMatcher( const Ptr<flann::IndexParams>& _indexParam ...@@ -1022,13 +1022,28 @@ FlannBasedMatcher::FlannBasedMatcher( const Ptr<flann::IndexParams>& _indexParam
void FlannBasedMatcher::add( InputArrayOfArrays _descriptors ) void FlannBasedMatcher::add( InputArrayOfArrays _descriptors )
{ {
DescriptorMatcher::add( _descriptors ); DescriptorMatcher::add( _descriptors );
if(_descriptors.isUMatVector() || _descriptors.isUMat())
{
std::vector<UMat> descriptors; std::vector<UMat> descriptors;
_descriptors.getUMatVector(descriptors); _descriptors.getUMatVector(descriptors);
for( size_t i = 0; i < descriptors.size(); i++ ) for( size_t i = 0; i < descriptors.size(); i++ )
{ {
addedDescCount += descriptors[i].rows; 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());
}
} }
void FlannBasedMatcher::clear() void FlannBasedMatcher::clear()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment