From 1ab1594d00be987d18bc6a62151a93428a7b919b Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Thu, 30 Jan 2014 17:23:56 +0400 Subject: [PATCH] workaround --- modules/core/src/ocl.cpp | 11 ++++++----- modules/imgproc/src/opencl/filterSepCol.cl | 1 + modules/imgproc/src/opencl/filterSepRow.cl | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/core/src/ocl.cpp b/modules/core/src/ocl.cpp index 03abc061b1..7334670f5c 100644 --- a/modules/core/src/ocl.cpp +++ b/modules/core/src/ocl.cpp @@ -3826,20 +3826,21 @@ static std::string kerToStr(const Mat & k) if (depth <= CV_8S) { for (int i = 0; i < width; ++i) - stream << (int)data[i] << ", "; - stream << (int)data[width]; + stream << "DIG(" << (int)data[i] << ")"; + stream << "DIG(" << (int)data[width] << ")"; } else if (depth == CV_32F) { stream.setf(std::ios_base::showpoint); for (int i = 0; i < width; ++i) - stream << data[i] << "f, "; - stream << data[width] << "f"; + stream << "DIG(" << data[i] << "f)"; + stream << "DIG(" << data[width] << "f)"; } else { for (int i = 0; i < width; ++i) - stream << data[i] << ", "; + stream << "DIG(" << data[i] << ")"; + stream << "DIG(" << data[width] << ")"; } return stream.str(); diff --git a/modules/imgproc/src/opencl/filterSepCol.cl b/modules/imgproc/src/opencl/filterSepCol.cl index 721eb90097..2657ae9312 100644 --- a/modules/imgproc/src/opencl/filterSepCol.cl +++ b/modules/imgproc/src/opencl/filterSepCol.cl @@ -60,6 +60,7 @@ Niko The info above maybe obsolete. ***********************************************************************************/ +#define DIG(a) a, __constant float mat_kernel[] = { COEFF }; __kernel __attribute__((reqd_work_group_size(LSIZE0,LSIZE1,1))) void col_filter diff --git a/modules/imgproc/src/opencl/filterSepRow.cl b/modules/imgproc/src/opencl/filterSepRow.cl index efb082e3e4..d0623f5905 100644 --- a/modules/imgproc/src/opencl/filterSepRow.cl +++ b/modules/imgproc/src/opencl/filterSepRow.cl @@ -144,6 +144,7 @@ Niko The info above maybe obsolete. ***********************************************************************************/ +#define DIG(a) a, __constant float mat_kernel[] = { COEFF }; __kernel __attribute__((reqd_work_group_size(LSIZE0,LSIZE1,1))) void row_filter_C1_D0