Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

ocl: filter2D: fix processing of kernel with double datatype

Browse Source
pull/1721/head
Alexander Alekhin 11 years ago
parent 8a4f1bbbdf
commit 0104f59feb
2 changed files with 8 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      modules/ocl/src/filtering.cpp
  2. 11
      modules/ocl/test/test_filters.cpp

2
modules/ocl/src/filtering.cpp
Unescape View File

@ -510,7 +510,7 @@ public:
func(src, dst, kernel, ksize, anchor, borderType) ; func(src, dst, kernel, ksize, anchor, borderType) ;
} }
oclMat kernel; Mat kernel;
GPUFilter2D_t func; GPUFilter2D_t func;
}; };
} }

11
modules/ocl/test/test_filters.cpp
Unescape View File

@ -377,9 +377,12 @@ OCL_TEST_P(MedianFilter, Mat)
(int)BORDER_REFLECT|BORDER_ISOLATED, (int)BORDER_WRAP|BORDER_ISOLATED, \ (int)BORDER_REFLECT|BORDER_ISOLATED, (int)BORDER_WRAP|BORDER_ISOLATED, \
(int)BORDER_REFLECT_101|BORDER_ISOLATED*/) // WRAP and ISOLATED are not supported by cv:: version (int)BORDER_REFLECT_101|BORDER_ISOLATED*/) // WRAP and ISOLATED are not supported by cv:: version
#define FILTER_DATATYPES Values(CV_8UC1, CV_8UC2, CV_8UC3, CV_8UC4, \
CV_32FC1, CV_32FC3, CV_32FC4, \
CV_64FC1, CV_64FC3, CV_64FC4)
INSTANTIATE_TEST_CASE_P(Filter, Blur, Combine( INSTANTIATE_TEST_CASE_P(Filter, Blur, Combine(
Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_32FC1, CV_32FC4), FILTER_DATATYPES,
Values(3, 5, 7), Values(3, 5, 7),
Values(Size(0, 0)), // not used Values(Size(0, 0)), // not used
FILTER_BORDER_SET_NO_WRAP_NO_ISOLATED, FILTER_BORDER_SET_NO_WRAP_NO_ISOLATED,
@ -387,7 +390,7 @@ INSTANTIATE_TEST_CASE_P(Filter, Blur, Combine(
Bool())); Bool()));
INSTANTIATE_TEST_CASE_P(Filter, LaplacianTest, Combine( INSTANTIATE_TEST_CASE_P(Filter, LaplacianTest, Combine(
Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_32FC1, CV_32FC3, CV_32FC4), FILTER_DATATYPES,
Values(1, 3), Values(1, 3),
Values(Size(0, 0)), // not used Values(Size(0, 0)), // not used
FILTER_BORDER_SET_NO_WRAP_NO_ISOLATED, FILTER_BORDER_SET_NO_WRAP_NO_ISOLATED,
@ -435,7 +438,7 @@ INSTANTIATE_TEST_CASE_P(Filter, GaussianBlurTest, Combine(
Bool())); Bool()));
INSTANTIATE_TEST_CASE_P(Filter, Filter2D, testing::Combine( INSTANTIATE_TEST_CASE_P(Filter, Filter2D, testing::Combine(
Values(CV_8UC1, CV_32FC1, CV_32FC4), FILTER_DATATYPES,
Values(3, 15), // TODO 25: CPU implementation has some issues Values(3, 15), // TODO 25: CPU implementation has some issues
Values(Size(-1, -1), Size(0, 0), Size(2, 1)), // anchor Values(Size(-1, -1), Size(0, 0), Size(2, 1)), // anchor
FILTER_BORDER_SET_NO_WRAP_NO_ISOLATED, FILTER_BORDER_SET_NO_WRAP_NO_ISOLATED,
@ -459,7 +462,7 @@ INSTANTIATE_TEST_CASE_P(Filter, AdaptiveBilateral, Combine(
Bool())); Bool()));
INSTANTIATE_TEST_CASE_P(Filter, MedianFilter, Combine( INSTANTIATE_TEST_CASE_P(Filter, MedianFilter, Combine(
Values((MatType)CV_8UC1, (MatType)CV_8UC4, (MatType)CV_32FC1, (MatType)CV_32FC4), Values(CV_8UC1, CV_8UC4, CV_32FC1, CV_32FC4),
Values(3, 5), Values(3, 5),
Values(Size(0, 0)), // not used Values(Size(0, 0)), // not used
Values(0), // not used Values(0), // not used

Write Preview
Loading…
Cancel
Save