From 0fd872bfa9e8b3a5e6e77652201df1b86912ace8 Mon Sep 17 00:00:00 2001 From: yao Date: Mon, 28 Oct 2013 17:36:43 +0800 Subject: [PATCH] fix bug #1480 --- modules/ocl/src/filtering.cpp | 2 +- modules/ocl/test/test_filters.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/ocl/src/filtering.cpp b/modules/ocl/src/filtering.cpp index 0a2562d8c..84d41ec93 100644 --- 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 f = createMorphologyFilter_GPU(op, src.type(), kernel, anchor, iterations); + Ptr f = createMorphologyFilter_GPU(op, src.type(), kernel, anchor, iterations); f->apply(src, dst); } diff --git a/modules/ocl/test/test_filters.cpp b/modules/ocl/test/test_filters.cpp index 2e54570e7..927410e12 100644 --- 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(