From 34bfda10caf27e13394e91ed06cbab0f7550b85f Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Tue, 9 Oct 2012 20:25:36 +0400 Subject: [PATCH] Fix regression in core arithmetic --- modules/core/src/arithm.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/core/src/arithm.cpp b/modules/core/src/arithm.cpp index d2f2819..90c29bc 100644 --- a/modules/core/src/arithm.cpp +++ b/modules/core/src/arithm.cpp @@ -1278,7 +1278,9 @@ static void arithm_op(InputArray _src1, InputArray _src2, OutputArray _dst, "nor 'array op scalar', nor 'scalar op array'" ); haveScalar = true; CV_Assert(src2.type() == CV_64F && (src2.rows == 4 || src2.rows == 1)); - depth2 = MAX(src1.depth(), actualScalarDepth(src2.ptr(), src1.channels())); + + if (usrdata == 0) // hack to filter out multiply and divide + depth2 = actualScalarDepth(src2.ptr(), src1.channels()); } int cn = src1.channels(), depth1 = src1.depth(), wtype; -- 2.7.4