Resolving conflicts after rebasing from public

diff --cc modules/imgproc/src/smooth.cpp
index 4f66d48,ae6a708..a4f5899
--- 1/modules/imgproc/src/smooth.cpp
--- 2/modules/imgproc/src/smooth.cpp
+++ b/modules/imgproc/src/smooth.cpp
@@@ -2404,7 -2294,7 +2404,6 @@@ static bool ocl_bilateralFilter_8u(Inpu
  }
  
  #endif
--
  static void
  bilateralFilter_8u( const Mat& src, Mat& dst, int d,
      double sigma_color, double sigma_space,

diff --cc modules/imgproc/test/ocl/test_filters.cpp
index 539e11a,37e8961..392ab4d
--- 1/modules/imgproc/test/ocl/test_filters.cpp
--- 2/modules/imgproc/test/ocl/test_filters.cpp
+++ b/modules/imgproc/test/ocl/test_filters.cpp
@@@ -366,26 -374,23 +366,23 @@@ OCL_INSTANTIATE_TEST_CASE_P(Filter, Ero
                              Bool(),
                              Values(1))); // not used
  
- 
  OCL_INSTANTIATE_TEST_CASE_P(Filter, Dilate, Combine(
 -                            Values(CV_8UC1, CV_8UC4, CV_32FC1, CV_32FC4, CV_64FC1, CV_64FC4),
 +                            Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_32FC1, CV_32FC3, CV_32FC4, CV_64FC1, CV_64FC4),
                              Values(3, 5, 7),
                              Values(Size(0,0)),//not used
                              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_8UC4, CV_32FC1, CV_32FC4, CV_64FC1, CV_64FC4),
 +                            Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_32FC1, CV_32FC3, CV_32FC4, CV_64FC1, CV_64FC4),
                              Values(3, 5, 7),
 -                            Values(Size(0,0), Size(0,1), Size(0,2), Size(0,3), Size(0,4), Size(0,5),Size(0,6)),//uses as generator of operations
 -                            Values((BorderType)BORDER_CONSTANT),//not used
 +                            Values(Size(0, 0), Size(0, 1), Size(0, 2), Size(0, 3), Size(0, 4), Size(0, 5), Size(0, 6)), // used as generator of operations
 +                            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