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

Merge pull request #3088 from vbystricky:ocl_enableNormEtc

Browse Source
This commit is contained in:
Alexander Alekhin
2014-08-14 14:34:40 +00:00
parent 95a4943762 942ff5be57
commit 52ac61d87c
4 changed files with 61 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,7 +98,7 @@
#ifdef OP_CALC2
#define CALC_MAX2(p) \
maxval2 = MAX(maxval2, temp.p);
maxval2 = MAX(maxval2, temp2.p);
#else
#define CALC_MAX2(p)
#endif
@@ -196,7 +196,7 @@ __kernel void minmaxloc(__global const uchar * srcptr, int src_step, int src_off
#ifdef HAVE_SRC2
#ifdef HAVE_SRC2_CONT
src2_index = mul24(id, srcTSIZE);
src2_index = id * srcTSIZE; //mul24(id, srcTSIZE);
#else
src2_index = mad24(id / cols, src2_step, mul24(id % cols, srcTSIZE));
#endif