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

Changed src matrix complement computation

Browse Source
This commit is contained in:
Lorena García 2015-10-24 00:33:36 +02:00
parent fb03330ea3
commit 7cff60f4f6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1908,10 +1908,9 @@ void cv::morphologyEx( InputArray _src, OutputArray _dst, int op,
dst = temp - src; dst = temp - src;
break; break;
case MORPH_HITMISS: case MORPH_HITMISS:
k1 = (kernel == 1) / 255;
k2 = (kernel == -1) / 255;
normalize(src, src, 0, 1, NORM_MINMAX);
CV_Assert(src.type() == CV_8UC1); CV_Assert(src.type() == CV_8UC1);
k1 = (kernel == 1);
k2 = (kernel == -1);
if (countNonZero(k1) <= 0) if (countNonZero(k1) <= 0)
e1 = src; e1 = src;
else else
@ -1919,9 +1918,12 @@ void cv::morphologyEx( InputArray _src, OutputArray _dst, int op,
if (countNonZero(k2) <= 0) if (countNonZero(k2) <= 0)
e2 = src; e2 = src;
else else
erode(1 - src, e2, k2, anchor, iterations, borderType, borderValue); {
Mat src_complement;
bitwise_not(src, src_complement);
erode(src_complement, e2, k2, anchor, iterations, borderType, borderValue);
}
dst = e1 & e2; dst = e1 & e2;
normalize(dst, dst, 0, 255, NORM_MINMAX);
break; break;
default: default:
CV_Error( CV_StsBadArg, "unknown morphological operation" ); CV_Error( CV_StsBadArg, "unknown morphological operation" );