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

Fix regression in core arithmetic

Browse Source
This commit is contained in:
Andrey Kamaev 2012-10-09 20:25:36 +04:00
parent 8ebd04cbf9
commit 34bfda10ca
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1278,7 +1278,9 @@ static void arithm_op(InputArray _src1, InputArray _src2, OutputArray _dst,
"nor 'array op scalar', nor 'scalar op array'" ); "nor 'array op scalar', nor 'scalar op array'" );
haveScalar = true; haveScalar = true;
CV_Assert(src2.type() == CV_64F && (src2.rows == 4 || src2.rows == 1)); CV_Assert(src2.type() == CV_64F && (src2.rows == 4 || src2.rows == 1));
depth2 = MAX(src1.depth(), actualScalarDepth(src2.ptr<double>(), src1.channels()));
if (usrdata == 0) // hack to filter out multiply and divide
depth2 = actualScalarDepth(src2.ptr<double>(), src1.channels());
} }
int cn = src1.channels(), depth1 = src1.depth(), wtype; int cn = src1.channels(), depth1 = src1.depth(), wtype;