mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16948 from alalek:warning_16739

Browse Source
This commit is contained in:
Alexander Alekhin 2020-04-02 09:25:47 +00:00
commit 9109cb1ec6
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@
// */ // */
#include "precomp.hpp" #include "precomp.hpp"
#include <opencv2/core/utils/logger.hpp>
namespace cv namespace cv
{ {
@ -1319,10 +1320,18 @@ void MatOp_AddEx::assign(const MatExpr& e, Mat& m, int _type) const
cv::add(dst, e.s, dst); cv::add(dst, e.s, dst);
} }
else else
{
if (e.a.channels() > 1)
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");
cv::addWeighted(e.a, e.alpha, e.b, e.beta, e.s[0], dst); cv::addWeighted(e.a, e.alpha, e.b, e.beta, e.s[0], dst);
} }
}
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)
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");
e.a.convertTo(m, _type, e.alpha, e.s[0]); e.a.convertTo(m, _type, e.alpha, e.s[0]);
return; return;
} }