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

fixed fail in arithmetic test

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-09-24 16:14:19 +04:00
parent 494ae1562d
commit d09b3828b8
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1218,18 +1218,23 @@ namespace cv
static int actualScalarDepth(const Mat& src) static int actualScalarDepth(const Mat& src)
{ {
double min = MIN(MIN(*((double*)src.data), *((double*)src.data+1)), MIN(*((double*)src.data+2), (*((double*)src.data+3)))); const double* data = (const double*)src.data;
double max = MAX(MAX(*((double*)src.data), *((double*)src.data+1)), MAX(*((double*)src.data+2), (*((double*)src.data+3)))); double minval = MIN(data[0], data[1]);
minval = MIN(minval, data[2]);
minval = MIN(minval, data[3]);
double maxval = MAX(data[0], data[1]);
maxval = MAX(maxval, data[2]);
maxval = MAX(maxval, data[3]);
int depth = CV_64F; int depth = CV_64F;
if(min >= 0 && max <= UCHAR_MAX) if(minval >= 0 && maxval <= UCHAR_MAX)
depth = CV_8U; depth = CV_8U;
else if(min >= SCHAR_MIN && max <= SCHAR_MAX) else if(minval >= SCHAR_MIN && maxval <= SCHAR_MAX)
depth = CV_8S; depth = CV_8S;
else if(min >= 0 && max <= USHRT_MAX) else if(minval >= 0 && maxval <= USHRT_MAX)
depth = CV_16U; depth = CV_16U;
else if(min >= SHRT_MIN && max <= SHRT_MAX) else if(minval >= SHRT_MIN && maxval <= SHRT_MAX)
depth = CV_16S; depth = CV_16S;
else if(min >= INT_MIN && max <= INT_MAX) else if(minval >= INT_MIN && maxval <= INT_MAX)
depth = CV_32S; depth = CV_32S;
return depth; return depth;
} }
@ -1269,7 +1274,7 @@ static void arithm_op(InputArray _src1, InputArray _src2, OutputArray _dst,
"The operation is neither 'array op array' (where arrays have the same size and the same number of channels), " "The operation is neither 'array op array' (where arrays have the same size and the same number of channels), "
"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); CV_Assert(src2.type() == CV_64F && (src2.rows == 4 || src2.rows == 1));
depth2 = actualScalarDepth(src2); depth2 = actualScalarDepth(src2);
} }