Merge pull request #1703 from bitwangyaoyao:2.4_fix1480

11 years ago · bb15c00665
parent d3c0b36cd0 0fd872bfa9
commit bb15c00665
2 changed files with 3 additions and 3 deletions
--- a/modules/ocl/src/filtering.cpp
+++ b/modules/ocl/src/filtering.cpp
@ -451,7 +451,7 @@ void morphOp(int op, const oclMat &src, oclMat &dst, const Mat &_kernel, Point a
    else
        kernel = _kernel;

-    Ptr<FilterEngine_GPU> f = createMorphologyFilter_GPU(op, src.type(), kernel, anchor, iterations);
+    Ptr<MorphologyFilterEngine_GPU> f = createMorphologyFilter_GPU(op, src.type(), kernel, anchor, iterations);

    f->apply(src, dst);
 }
--- a/modules/ocl/test/test_filters.cpp
+++ b/modules/ocl/test/test_filters.cpp
@ -384,14 +384,14 @@ INSTANTIATE_TEST_CASE_P(Filter, Erode, Combine(
                            Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_32FC1, CV_32FC3, CV_32FC4),
                            Values(3, 5, 7),
                            Values(Size(0, 0)), // not used
-                            testing::Range(1, 2),
+                            testing::Range(1, 4),
                            Bool()));

 INSTANTIATE_TEST_CASE_P(Filter, Dilate, Combine(
                            Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_32FC1, CV_32FC3, CV_32FC4),
                            Values(3, 5, 7),
                            Values(Size(0, 0)), // not used
-                            testing::Range(1, 2),
+                            testing::Range(1, 4),
                            Bool()));

 INSTANTIATE_TEST_CASE_P(Filter, SobelTest, Combine(