From: sourin <choudhury.sourin@tcs.com>
Date: Thu, 18 Aug 2016 11:54:43 +0000 (+0530)
Subject: respective changes added
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1611^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce818dc01f7eaffc970857ce6a8e5be90ad3383a;p=platform%2Fupstream%2Fopencv.git

respective changes added
---

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 );
 }
-
 }