mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 12:10:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11620 from terfendail:hmmorph_fix

Browse Source
This commit is contained in:
Vadim Pisarevsky 2018-06-07 11:19:21 +00:00
commit 5e5d997dff
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/imgproc/src/morph.cpp
View File

@ -2115,16 +2115,18 @@ void cv::morphologyEx( InputArray _src, OutputArray _dst, int op,
k2 = (kernel == -1);
if (countNonZero(k1) <= 0)
e1 = src;
e1 = Mat(src.size(), src.type(), Scalar(255));
else
erode(src, e1, k1, anchor, iterations, borderType, borderValue);
if (countNonZero(k2) <= 0)
e2 = Mat(src.size(), src.type(), Scalar(255));
else
{
Mat src_complement;
bitwise_not(src, src_complement);
if (countNonZero(k2) <= 0)
e2 = src_complement;
else
erode(src_complement, e2, k2, anchor, iterations, borderType, borderValue);
}
dst = e1 & e2;
}
break;

6
modules/imgproc/test/test_filter.cpp
View File

@ -2102,6 +2102,12 @@ TEST(Imgproc_MorphEx, hitmiss_regression_8957)
ref.at<uchar>(1, 1) = 255;
ASSERT_DOUBLE_EQ(cvtest::norm(dst, ref, NORM_INF), 0.);
src.at<uchar>(1, 1) = 255;
ref.at<uchar>(0, 1) = 255;
ref.at<uchar>(2, 1) = 255;
cv::morphologyEx(src, dst, MORPH_HITMISS, kernel);
ASSERT_DOUBLE_EQ(cvtest::norm(dst, ref, NORM_INF), 0.);
}
TEST(Imgproc_MorphEx, hitmiss_zero_kernel)