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

fixed several compile errors/warnings; reacted on the PR comments

Browse Source
This commit is contained in:
Vadim Pisarevsky
2013-12-01 20:58:30 +04:00
parent 6da5d21331
commit d7f4a223cf
5 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/imgproc/src/opencl/cvtcolor.cl
View File

@@ -124,16 +124,17 @@ __kernel void RGB2Gray(__global const uchar* srcptr, int srcstep, int srcoffset,
#endif
}
#else
const int x0 = get_global_id(0)*STRIPE_SIZE;
const int x1 = min(x0 + STRIPE_SIZE, cols);
const int x_min = get_global_id(0)*STRIPE_SIZE;
const int x_max = min(x_min + STRIPE_SIZE, cols);
const int y = get_global_id(1);
if( y < rows )
{
__global const DATA_TYPE* src = (__global const DATA_TYPE*)(srcptr + mad24(y, srcstep, srcoffset)) + x0*scn;
__global const DATA_TYPE* src = (__global const DATA_TYPE*)(srcptr +
mad24(y, srcstep, srcoffset)) + x_min*scn;
__global DATA_TYPE* dst = (__global DATA_TYPE*)(dstptr + mad24(y, dststep, dstoffset));
int x;
for( x = x0; x < x1; x++, src += scn )
for( x = x_min; x < x_max; x++, src += scn )
#ifdef DEPTH_5
dst[x] = src[bidx] * 0.114f + src[1] * 0.587f + src[(bidx^2)] * 0.299f;
#else