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