From 9de70c9a00e60f0ae333e23de939a2fb4c7300e9 Mon Sep 17 00:00:00 2001 From: Elena Gvozdeva Date: Tue, 14 Jan 2014 17:34:05 +0400 Subject: [PATCH] Fixed trailing whitespace --- modules/imgproc/src/opencl/match_template.cl | 4 ++-- modules/imgproc/src/templmatch.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/imgproc/src/opencl/match_template.cl b/modules/imgproc/src/opencl/match_template.cl index 26a9cbc1e1..89a8d618f8 100644 --- a/modules/imgproc/src/opencl/match_template.cl +++ b/modules/imgproc/src/opencl/match_template.cl @@ -93,7 +93,7 @@ __kernel void matchTemplate_Naive_CCORR (__global const uchar * img,int img_step for (int c = 0; c < CN; c++) sum += (float)(img_ptr[j*CN+c] * tpl_ptr[j*CN+c]); - + } __global float * result = (__global float *)(res)+res_idx; *result = sum; @@ -300,7 +300,7 @@ __kernel void matchTemplate_CCOEFF_NORMED_C1 (__global const uchar * img_sums, i __global ELEM_TYPE* sum = (__global ELEM_TYPE*)(img_sums); __global float * sqsum = (__global float*)(img_sqsums); - float image_sum_ = (float)((sum[SUMS_PTR(t_cols, t_rows)] - sum[SUMS_PTR(t_cols, 0)]) - + float image_sum_ = (float)((sum[SUMS_PTR(t_cols, t_rows)] - sum[SUMS_PTR(t_cols, 0)]) - (sum[SUMS_PTR(0, t_rows)] - sum[SUMS_PTR(0, 0)])); float image_sqsum_ = (float)((sqsum[SQSUMS_PTR(t_cols, t_rows)] - sqsum[SQSUMS_PTR(t_cols, 0)]) - diff --git a/modules/imgproc/src/templmatch.cpp b/modules/imgproc/src/templmatch.cpp index ea6bddc8d6..1abb8fb2f3 100644 --- a/modules/imgproc/src/templmatch.cpp +++ b/modules/imgproc/src/templmatch.cpp @@ -273,7 +273,7 @@ namespace cv else kernelName = "matchTemplate_CCOEFF_NORMED_C4"; - ocl::Kernel k(kernelName, ocl::imgproc::match_template_oclsrc, + ocl::Kernel k(kernelName, ocl::imgproc::match_template_oclsrc, format("-D type=%s -D elem_type=%s -D cn=%d", ocl::typeToStr(type), ocl::typeToStr(depth), cn)); if (k.empty()) return false;