projects
/
platform
/
upstream
/
opencv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
[platform/upstream/opencv.git]
/
modules
/
core
/
src
/
arithm.cpp
diff --git
a/modules/core/src/arithm.cpp
b/modules/core/src/arithm.cpp
index
508bebc
..
c1653d7
100644
(file)
--- a/
modules/core/src/arithm.cpp
+++ b/
modules/core/src/arithm.cpp
@@
-1180,7
+1180,7
@@
void cv::compare(InputArray _src1, InputArray _src2, OutputArray _dst, int op)
CV_Assert( op == CMP_LT || op == CMP_LE || op == CMP_EQ ||
op == CMP_NE || op == CMP_GE || op == CMP_GT );
- if(_src1.empty()
&&
_src2.empty())
+ if(_src1.empty()
||
_src2.empty())
{
_dst.release();
return;