projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d06bdd5
)
respective changes added
author
sourin
<choudhury.sourin@tcs.com>
Thu, 18 Aug 2016 11:54:43 +0000
(17:24 +0530)
committer
sourin
<choudhury.sourin@tcs.com>
Thu, 18 Aug 2016 11:54:43 +0000
(17:24 +0530)
modules/features2d/src/matchers.cpp
patch
|
blob
|
history
diff --git
a/modules/features2d/src/matchers.cpp
b/modules/features2d/src/matchers.cpp
index
11dfa6d
..
2519dc2
100644
(file)
--- 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 );
}
-
}