From 9391ccfe35830e1b52b4e69818a1054d846435e1 Mon Sep 17 00:00:00 2001 From: vbystricky Date: Wed, 18 Jun 2014 15:03:09 +0400 Subject: [PATCH 1/2] Move some variables into #ifdef --- modules/core/src/opencl/lut.cl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/core/src/opencl/lut.cl b/modules/core/src/opencl/lut.cl index a33d50c6f..a7436d620 100644 --- a/modules/core/src/opencl/lut.cl +++ b/modules/core/src/opencl/lut.cl @@ -63,7 +63,7 @@ dst[0] = lut_l[idx]; #else #define LUT_OP(num)\ - src = (__global const srcT *)(srcptr + mad24(num, src_step, src_index));\ + __global const srcT * src = (__global const srcT *)(srcptr + mad24(num, src_step, src_index));\ dst = (__global dstT *)(dstptr + mad24(num, dst_step, dst_index));\ for (int cn = 0; cn < dcn; ++cn)\ dst[cn] = lut_l[src[cn]]; @@ -100,7 +100,7 @@ dst[0] = lut_l[idx]; #else #define LUT_OP(num)\ - src = (__global const srcT *)(srcptr + mad24(num, src_step, src_index));\ + __global const srcT *src = (__global const srcT *)(srcptr + mad24(num, src_step, src_index));\ dst = (__global dstT *)(dstptr + mad24(num, dst_step, dst_index));\ for (int cn = 0; cn < dcn; ++cn)\ dst[cn] = lut_l[mad24(src[cn], lcn, cn)]; @@ -133,8 +133,7 @@ __kernel void LUT(__global const uchar * srcptr, int src_step, int src_offset, { int src_index = mad24(y, src_step, mad24(x, (int)sizeof(srcT) * dcn, src_offset)); int dst_index = mad24(y, dst_step, mad24(x, (int)sizeof(dstT) * dcn, dst_offset)); - __global const srcT * src; __global dstT * dst; - int tmp_idx; + __global dstT * dst; LUT_OP(0); if (y < rows - 1) { From ea6da6ee95f79299e12f139e0a7862b4d65e7f9b Mon Sep 17 00:00:00 2001 From: vbystricky Date: Wed, 18 Jun 2014 15:44:56 +0400 Subject: [PATCH 2/2] Change uchar2 to short --- modules/core/src/opencl/lut.cl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/core/src/opencl/lut.cl b/modules/core/src/opencl/lut.cl index a7436d620..9bcd1b66f 100644 --- a/modules/core/src/opencl/lut.cl +++ b/modules/core/src/opencl/lut.cl @@ -52,10 +52,10 @@ dst[2] = lut_l[idx.z]; #elif dcn == 2 #define LUT_OP(num)\ - __global const uchar2 * idx = (__global const uchar2 *)(srcptr + mad24(num, src_step, src_index));\ + short idx = *(__global const short *)(srcptr + mad24(num, src_step, src_index));\ dst = (__global dstT *)(dstptr + mad24(num, dst_step, dst_index));\ - dst[0] = lut_l[idx->x];\ - dst[1] = lut_l[idx->y]; + dst[0] = lut_l[idx & 0xff];\ + dst[1] = lut_l[(idx >> 8) & 0xff]; #elif dcn == 1 #define LUT_OP(num)\ uchar idx = (srcptr + mad24(num, src_step, src_index))[0];\