generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed mixed-type arithmetic operations (ticket #1224)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-07-14 14:54:05 +00:00
parent 0db73575a6
commit 12715c210d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/arithm.cpp
View File

@@ -1291,7 +1291,7 @@ void arithm_op(InputArray _src1, InputArray _src2, OutputArray _dst,
uchar *buf, *maskbuf = 0, *buf1 = 0, *buf2 = 0, *wbuf = 0; 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); 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(); Mat dst = _dst.getMat();
BinaryFunc func = tab[CV_MAT_DEPTH(wtype)]; BinaryFunc func = tab[CV_MAT_DEPTH(wtype)];