third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7130 from souch55:Fixed

Browse Source
This commit is contained in:
Alexander Alekhin 2016-09-02 12:49:49 +00:00
commit 8104db2232
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -621,8 +621,7 @@ void DescriptorMatcher::checkMasks( InputArrayOfArrays _masks, int queryDescript
{
int rows = trainDescCollection[i].empty() ? utrainDescCollection[i].rows : trainDescCollection[i].rows;
CV_Assert( masks[i].rows == queryDescriptorsCount &&
(masks[i].cols == rows || masks[i].cols == rows) &&
masks[i].type() == CV_8UC1 );
masks[i].cols == rows && masks[i].type() == CV_8UC1);
}
}
}
@ -1375,5 +1374,4 @@ void FlannBasedMatcher::radiusMatchImpl( InputArray _queryDescriptors, std::vect
convertToDMatches( mergedDescriptors, indices, dists, matches );
}
}