1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00

Merge pull request #11634 from vpisarev:empty_mat_with_types_2

fixes handling of empty matrices in some functions (#11634)

* a part of PR #11416 by Yuki Takehara

* moved the empty mat check in Mat::copyTo()

* fixed some test failures
This commit is contained in:
Vadim Pisarevsky
2018-05-31 19:36:39 +03:00
committed by Alexander Alekhin
parent da75e463a8
commit 7d19bd6c19
9 changed files with 42 additions and 11 deletions
+6
View File
@@ -1233,6 +1233,12 @@ 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())
{
_dst.release();
return;
}
bool haveScalar = false;
if ((_src1.isMatx() + _src2.isMatx()) == 1