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

fixing OCL run condition (build program failure for comparison 64F Mat with Scalar)

Browse Source
This commit is contained in:
Andrey Pavlenko 2014-04-03 16:21:04 +04:00
parent 6ef94b52ad
commit 271f60ba7a
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2621,12 +2621,11 @@ static bool ocl_compare(InputArray _src1, InputArray _src2, OutputArray _dst, in
int type1 = _src1.type(), depth1 = CV_MAT_DEPTH(type1), cn = CV_MAT_CN(type1), int type1 = _src1.type(), depth1 = CV_MAT_DEPTH(type1), cn = CV_MAT_CN(type1),
type2 = _src2.type(), depth2 = CV_MAT_DEPTH(type2); type2 = _src2.type(), depth2 = CV_MAT_DEPTH(type2);
if (!haveScalar) if (!doubleSupport && depth1 == CV_64F)
{ return false;
if ( (!doubleSupport && depth1 == CV_64F) ||
!_src1.sameSize(_src2) || type1 != type2) if (!haveScalar && (!_src1.sameSize(_src2) || type1 != type2))
return false; return false;
}
int kercn = haveScalar ? cn : ocl::predictOptimalVectorWidth(_src1, _src2, _dst); int kercn = haveScalar ? cn : ocl::predictOptimalVectorWidth(_src1, _src2, _dst);
// Workaround for bug with "?:" operator in AMD OpenCL compiler // Workaround for bug with "?:" operator in AMD OpenCL compiler