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

Merge pull request #3073 from vbystricky:ocl_fixMinMaxLoc

Browse Source
This commit is contained in:
Alexander Alekhin 2014-08-12 10:21:41 +00:00
commit da806cc3e7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/opencl/minmaxloc.cl
View File

@ -185,7 +185,7 @@ __kernel void minmaxloc(__global const uchar * srcptr, int src_step, int src_off
#endif #endif
{ {
#ifdef HAVE_SRC_CONT #ifdef HAVE_SRC_CONT
src_index = mul24(id, srcTSIZE); src_index = id * srcTSIZE;//mul24(id, srcTSIZE);
#else #else
src_index = mad24(id / cols, src_step, mul24(id % cols, srcTSIZE)); src_index = mad24(id / cols, src_step, mul24(id % cols, srcTSIZE));
#endif #endif

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

@ -1454,7 +1454,7 @@ static bool ocl_minMaxIdx( InputArray _src, double* minVal, double* maxVal, int*
CV_Assert(!haveSrc2 || _src2.type() == type); CV_Assert(!haveSrc2 || _src2.type() == type);
if (depth == CV_32S || depth == CV_32F) if (depth == CV_32S)
return false; return false;
if ((depth == CV_64F || ddepth == CV_64F) && !doubleSupport) if ((depth == CV_64F || ddepth == CV_64F) && !doubleSupport)