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

Add else branch to previous fix

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

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

@ -1281,6 +1281,8 @@ static void arithm_op(InputArray _src1, InputArray _src2, OutputArray _dst,
if (usrdata == 0) // hack to filter out multiply and divide if (usrdata == 0) // hack to filter out multiply and divide
depth2 = actualScalarDepth(src2.ptr<double>(), src1.channels()); depth2 = actualScalarDepth(src2.ptr<double>(), src1.channels());
else
depth2 = CV_64F;
} }
int cn = src1.channels(), depth1 = src1.depth(), wtype; int cn = src1.channels(), depth1 = src1.depth(), wtype;