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

Merge pull request #3023 from vbystricky:ocl_minMaxLoc

Browse Source
This commit is contained in:
Alexander Alekhin 2014-08-01 08:57:37 +00:00
commit b3e31fb8d6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,7 +209,7 @@ __kernel void minmaxloc(__global const uchar * srcptr, int src_step, int src_off
#if kercn == 1 #if kercn == 1
#ifdef NEED_MINVAL #ifdef NEED_MINVAL
#if NEED_MINLOC #ifdef NEED_MINLOC
if (minval > temp) if (minval > temp)
{ {
minval = temp; minval = temp;
@ -326,7 +326,7 @@ __kernel void minmaxloc(__global const uchar * srcptr, int src_step, int src_off
int lid2 = lsize + lid; int lid2 = lsize + lid;
#ifdef NEED_MINVAL #ifdef NEED_MINVAL
#ifdef NEED_MAXLOC #ifdef NEED_MINLOC
if (localmem_min[lid] >= localmem_min[lid2]) if (localmem_min[lid] >= localmem_min[lid2])
{ {
if (localmem_min[lid] == localmem_min[lid2]) if (localmem_min[lid] == localmem_min[lid2])

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

@ -1452,7 +1452,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 || !_mask.empty()) if (depth == CV_32S || depth == CV_32F)
return false; return false;
if ((depth == CV_64F || ddepth == CV_64F) && !doubleSupport) if ((depth == CV_64F || ddepth == CV_64F) && !doubleSupport)