Skip to content

O
opencv
Commit da806cc3 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #3073 from vbystricky:ocl_fixMinMaxLoc

parents f937f4d9 6fb282aa
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/core/src/opencl/minmaxloc.cl
View file @ da806cc3
...@@ -185,7 +185,7 @@ __kernel void minmaxloc(__global const uchar * srcptr, int src_step, int src_off ...@@ -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
......
modules/core/src/stat.cpp
View file @ da806cc3
...@@ -1454,7 +1454,7 @@ static bool ocl_minMaxIdx( InputArray _src, double* minVal, double* maxVal, int* ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment