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

Enable OpenCL version of norm and convertScaleAbs or 32F data

Browse Source 
Fix error in minmaxloc.cl
Change test for convertScaleAbs
Fix minMaxIdx for _src2 align
Change epsilon on the tests
This commit is contained in:
vbystricky
2014-08-13 10:21:16 +04:00
parent 12c69ad490
commit 1fe403f461
4 changed files with 57 additions and 21 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