third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17196 from alalek:core_matexpr_fix_warning

Browse Source
This commit is contained in:
Alexander Alekhin 2020-05-12 18:50:58 +00:00
commit bd1b252de9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/matrix_expressions.cpp
View File

@ -1329,7 +1329,7 @@ void MatOp_AddEx::assign(const MatExpr& e, Mat& m, int _type) const
} }
else if( e.s.isReal() && (dst.data != m.data || fabs(e.alpha) != 1)) else if( e.s.isReal() && (dst.data != m.data || fabs(e.alpha) != 1))
{ {
if (e.a.channels() > 1) if (e.a.channels() > 1 && e.s[0] != 0.0)
CV_LOG_ONCE_WARNING(NULL, "OpenCV/MatExpr: processing of multi-channel arrays might be changed in the future: " CV_LOG_ONCE_WARNING(NULL, "OpenCV/MatExpr: processing of multi-channel arrays might be changed in the future: "
"https://github.com/opencv/opencv/issues/16739"); "https://github.com/opencv/opencv/issues/16739");
e.a.convertTo(m, _type, e.alpha, e.s[0]); e.a.convertTo(m, _type, e.alpha, e.s[0]);