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:
0db7357
)
fixed mixed-type arithmetic operations (ticket #1224)
author
Vadim Pisarevsky
<no@email>
Thu, 14 Jul 2011 14:54:05 +0000
(14:54 +0000)
committer
Vadim Pisarevsky
<no@email>
Thu, 14 Jul 2011 14:54:05 +0000
(14:54 +0000)
modules/core/src/arithm.cpp
patch
|
blob
|
history
diff --git
a/modules/core/src/arithm.cpp
b/modules/core/src/arithm.cpp
index
fc9f668
..
bb1614e
100644
(file)
--- a/
modules/core/src/arithm.cpp
+++ b/
modules/core/src/arithm.cpp
@@
-1291,7
+1291,7
@@
void arithm_op(InputArray _src1, InputArray _src2, OutputArray _dst,
uchar *buf, *maskbuf = 0, *buf1 = 0, *buf2 = 0, *wbuf = 0;
size_t bufesz = (cvtsrc1 ? wsz : 0) + (cvtsrc2 || haveScalar ? wsz : 0) + (cvtdst ? wsz : 0) + (haveMask ? dsz : 0);
- _dst.create(src1.dims, src1.size,
src1.type()
);
+ _dst.create(src1.dims, src1.size,
dtype
);
Mat dst = _dst.getMat();
BinaryFunc func = tab[CV_MAT_DEPTH(wtype)];