Indent fixes

diff --git a/modules/imgproc/src/opencl/bilateral.cl b/modules/imgproc/src/opencl/bilateral.cl
index ee0f0c7..9b9d31f 100644 (file)
--- a/modules/imgproc/src/opencl/bilateral.cl
+++ b/modules/imgproc/src/opencl/bilateral.cl
@@ -77,7 +77,7 @@ __kernel void bilateral(__global const uchar * src, int src_step, int src_offset
             int_t val = convert_int_t(loadpix(src + src_index + space_ofs[k]));
             uint diff = (uint)SUM(abs(val - val0));
             float w = space_weight[k] * native_exp((float)(diff * diff * as_float(gauss_color_coeff)));
-                       sum += convert_float_t(val) * (float_t)(w);
+                   sum += convert_float_t(val) * (float_t)(w);
             wsum += w;
         }
 
@@ -107,7 +107,7 @@ __kernel void bilateral_float(__global const uchar * src, int src_step, int src_
             float_t val = convert_float_t(loadpix(src + src_index + space_ofs[k]));
             float i = SUM(fabs(val - val0));
             float w = space_weight[k] * native_exp(i * i * as_float(gauss_color_coeff));
-                       sum += val * w;
+                   sum += val * w;
             wsum += w;
         }
         storepix(convert_uchar_t(sum / (float_t)(wsum)), dst + dst_index);
@@ -140,4 +140,3 @@ __kernel void bilateral_float4(__global const uchar * src, int src_step, int src
         vstore4(convert_uchar4_rtz(sum), 0, dst + dst_index);
     }
 }
-

diff --git a/modules/imgproc/src/smooth.cpp b/modules/imgproc/src/smooth.cpp
index a4f5899..976fa62 100644 (file)
--- a/modules/imgproc/src/smooth.cpp
+++ b/modules/imgproc/src/smooth.cpp
@@ -2341,50 +2341,49 @@ static bool ocl_bilateralFilter_8u(InputArray _src, OutputArray _dst, int d,
         return false;
 
     copyMakeBorder(src, temp, radius, radius, radius, radius, borderType);
-           
     std::vector<float> _space_weight(d * d);
     std::vector<int> _space_ofs(d * d);
     
     float * const space_weight = &_space_weight[0];
     int * const space_ofs = &_space_ofs[0];
 
-           // initialize space-related bilateral filter coefficients
+       // initialize space-related bilateral filter coefficients
     for( i = -radius, maxk = 0; i <= radius; i++ )
         for( j = -radius; j <= radius; j++ )
         {
             double r = std::sqrt((double)i * i + (double)j * j);
             if ( r > radius )
-                               continue;
-                       space_weight[maxk] = (float)std::exp(r * r * gauss_space_coeff);
-                       space_ofs[maxk++] = (int)(i * temp.step + j * cn);
-               }
-
-               char cvt[3][40];
-               String cnstr = cn > 1 ? format("%d", cn) : "";
-               String kernelName("bilateral");
-               size_t sizeDiv = 1;
+                continue;
+            space_weight[maxk] = (float)std::exp(r * r * gauss_space_coeff);
+            space_ofs[maxk++] = (int)(i * temp.step + j * cn);
+        }
+
+        char cvt[3][40];
+        String cnstr = cn > 1 ? format("%d", cn) : "";
+        String kernelName("bilateral");
+        size_t sizeDiv = 1;
                if ((ocl::Device::getDefault().isIntel()) &&
-                       (ocl::Device::getDefault().type() == ocl::Device::TYPE_GPU))
+           (ocl::Device::getDefault().type() == ocl::Device::TYPE_GPU))
                {
-                       //Intel GPU
-                       if (dst.cols % 4 == 0 && cn == 1) // For single channel x4 sized images.
-                       {
-                               kernelName = "bilateral_float4";
-                               sizeDiv = 4;
-                       }
-                       else
-                       {
-                               kernelName = "bilateral_float";
-                       }
-               }
-               ocl::Kernel k(kernelName.c_str(), ocl::imgproc::bilateral_oclsrc,
-                       format("-D radius=%d -D maxk=%d -D cn=%d -D int_t=%s -D uint_t=uint%s -D convert_int_t=%s"
-                       " -D uchar_t=%s -D float_t=%s -D convert_float_t=%s -D convert_uchar_t=%s -D gauss_color_coeff=%f",
-                       radius, maxk, cn, ocl::typeToStr(CV_32SC(cn)), cnstr.c_str(),
-                       ocl::convertTypeStr(CV_8U, CV_32S, cn, cvt[0]),
-                       ocl::typeToStr(type), ocl::typeToStr(CV_32FC(cn)),
-                         ocl::convertTypeStr(CV_32S, CV_32F, cn, cvt[1]),
-                         ocl::convertTypeStr(CV_32F, CV_8U, cn, cvt[2]), gauss_color_coeff));
+            //Intel GPU
+            if (dst.cols % 4 == 0 && cn == 1) // For single channel x4 sized images.
+            {
+                kernelName = "bilateral_float4";
+                sizeDiv = 4;
+            }
+            else
+            {
+                kernelName = "bilateral_float";
+            }
+     }
+       ocl::Kernel k(kernelName.c_str(), ocl::imgproc::bilateral_oclsrc,
+               format("-D radius=%d -D maxk=%d -D cn=%d -D int_t=%s -D uint_t=uint%s -D convert_int_t=%s"
+               " -D uchar_t=%s -D float_t=%s -D convert_float_t=%s -D convert_uchar_t=%s -D gauss_color_coeff=%f",
+               radius, maxk, cn, ocl::typeToStr(CV_32SC(cn)), cnstr.c_str(),
+            ocl::convertTypeStr(CV_8U, CV_32S, cn, cvt[0]),
+               ocl::typeToStr(type), ocl::typeToStr(CV_32FC(cn)),
+            ocl::convertTypeStr(CV_32S, CV_32F, cn, cvt[1]),
+            ocl::convertTypeStr(CV_32F, CV_8U, cn, cvt[2]), gauss_color_coeff));
     if (k.empty())
         return false;
 

diff --git a/modules/imgproc/test/ocl/test_filters.cpp b/modules/imgproc/test/ocl/test_filters.cpp
index 392ab4d..43e2369 100644 (file)
--- a/modules/imgproc/test/ocl/test_filters.cpp
+++ b/modules/imgproc/test/ocl/test_filters.cpp
@@ -373,7 +373,7 @@ OCL_INSTANTIATE_TEST_CASE_P(Filter, Dilate, Combine(
                             Values((BorderType)BORDER_CONSTANT),//not used
                             Values(1.0, 2.0, 3.0),
                             Bool(),
-                                                       Values(1))); //not used
+                            Values(1))); //not used
 
 OCL_INSTANTIATE_TEST_CASE_P(Filter, MorphologyEx, Combine(
                             Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_32FC1, CV_32FC3, CV_32FC4, CV_64FC1, CV_64FC4),
@@ -382,7 +382,7 @@ OCL_INSTANTIATE_TEST_CASE_P(Filter, MorphologyEx, Combine(
                             Values((BorderType)BORDER_CONSTANT),// not used
                             Values(1.0, 2.0, 3.0),
                             Bool(),
-                                                       Values(1))); //not used
+                            Values(1))); //not used
 
 
 } } // namespace cvtest::ocl