Add else branch to previous fix

0afd5125 · Andrey Kamaev · 34bfda10 · 0afd5125
Commit 0afd5125 authored Oct 09, 2012 by Andrey Kamaev
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

arithm.cpp modules/core/src/arithm.cpp +2 -0

No files found.
--- a/modules/core/src/arithm.cpp
+++ b/modules/core/src/arithm.cpp
@@ -1281,6 +1281,8 @@ static void arithm_op(InputArray _src1, InputArray _src2, OutputArray _dst,

        if (usrdata == 0) // hack to filter out multiply and divide
            depth2 = actualScalarDepth(src2.ptr<double>(), src1.channels());
+        else
+            depth2 = CV_64F;
    }

    int cn = src1.channels(), depth1 = src1.depth(), wtype;