generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolving conflicts after rebasing from public

Browse Source
This commit is contained in:
unknown 2014-04-10 12:28:37 -07:00
commit e032b5f5d5
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/imgproc/src/smooth.cpp
View File

@ -2404,7 +2404,6 @@ static bool ocl_bilateralFilter_8u(InputArray _src, OutputArray _dst, int d,
}
#endif
static void
bilateralFilter_8u( const Mat& src, Mat& dst, int d,
double sigma_color, double sigma_space,

7
modules/imgproc/test/ocl/test_filters.cpp
View File

@ -366,7 +366,6 @@ OCL_INSTANTIATE_TEST_CASE_P(Filter, Erode, Combine(
Bool(),
Values(1))); // not used
OCL_INSTANTIATE_TEST_CASE_P(Filter, Dilate, Combine(
Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_32FC1, CV_32FC3, CV_32FC4, CV_64FC1, CV_64FC4),
Values(3, 5, 7),
@ -374,8 +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),
@ -384,8 +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