Merge pull request #7130 from souch55:Fixed

9 years ago · 8104db2232
parent a5dcefd50e ce818dc01f
commit 8104db2232
1 changed files with 1 additions and 3 deletions
--- a/modules/features2d/src/matchers.cpp
+++ b/modules/features2d/src/matchers.cpp
@ -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 );
 }
-
 }