From 7626a8e8def28f5f5f25503c93d1190a90830c63 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Mon, 2 Dec 2013 12:13:50 +0400 Subject: [PATCH] try to eliminate failure in opencv_imgproc_test --- modules/imgproc/src/color.cpp | 2 +- modules/imgproc/src/opencl/cvtcolor.cl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/imgproc/src/color.cpp b/modules/imgproc/src/color.cpp index 4bc3ffb..6d5845e 100644 --- a/modules/imgproc/src/color.cpp +++ b/modules/imgproc/src/color.cpp @@ -2695,7 +2695,7 @@ static bool ocl_cvtColor( InputArray _src, OutputArray _dst, int code, int dcn ) UMat src = _src.getUMat(), dst; Size sz = src.size(), dstSz = sz; int scn = src.channels(), depth = src.depth(), bidx; - int dims = 2, stripeSize = 32; + int dims = 2, stripeSize = 1; size_t globalsize[] = { src.cols, src.rows }; ocl::Kernel k; diff --git a/modules/imgproc/src/opencl/cvtcolor.cl b/modules/imgproc/src/opencl/cvtcolor.cl index 883e2eb..ad7562f 100644 --- a/modules/imgproc/src/opencl/cvtcolor.cl +++ b/modules/imgproc/src/opencl/cvtcolor.cl @@ -109,7 +109,7 @@ __kernel void RGB2Gray(__global const uchar* srcptr, int srcstep, int srcoffset, __global uchar* dstptr, int dststep, int dstoffset, int rows, int cols) { -#if 0 +#if 1 const int x = get_global_id(0); const int y = get_global_id(1); -- 2.7.4