From ce818dc01f7eaffc970857ce6a8e5be90ad3383a Mon Sep 17 00:00:00 2001 From: sourin Date: Thu, 18 Aug 2016 17:24:43 +0530 Subject: [PATCH] respective changes added --- modules/features2d/src/matchers.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/features2d/src/matchers.cpp b/modules/features2d/src/matchers.cpp index 11dfa6d..2519dc2 100644 --- a/modules/features2d/src/matchers.cpp +++ b/modules/features2d/src/matchers.cpp @@ -613,8 +613,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); } } } @@ -1357,5 +1356,4 @@ void FlannBasedMatcher::radiusMatchImpl( InputArray _queryDescriptors, std::vect convertToDMatches( mergedDescriptors, indices, dists, matches ); } - } -- 2.7.4