projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
34bfda1
)
Add else branch to previous fix
author
Andrey Kamaev
<andrey.kamaev@itseez.com>
Tue, 9 Oct 2012 16:34:10 +0000
(20:34 +0400)
committer
Andrey Kamaev
<andrey.kamaev@itseez.com>
Tue, 9 Oct 2012 16:34:10 +0000
(20:34 +0400)
modules/core/src/arithm.cpp
patch
|
blob
|
history
diff --git
a/modules/core/src/arithm.cpp
b/modules/core/src/arithm.cpp
index
90c29bc
..
b90f59f
100644
(file)
--- 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;