potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2021-05-01 09:44:24 +00:00
parent 1dacea3a20 8550f7e04d
commit 170bf6d7af
18 changed files with 272 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/contours.cpp
+29 -3
View File
@@ -625,7 +625,8 @@ icvFetchContour( schar *ptr,
/*
trace contour until certain point is met.
returns 1 if met, 0 else.
returns 1 if met and this is the last contour
encountered by a raster scan reaching the point, 0 else.
*/
static int
icvTraceContour( schar *ptr, int step, schar *stop_ptr, int is_hole )
@@ -668,14 +669,39 @@ icvTraceContour( schar *ptr, int step, schar *stop_ptr, int is_hole )
break;
}
if( i3 == stop_ptr || (i4 == i0 && i3 == i1) )
if (i3 == stop_ptr) {
if (!(*i3 & 0x80)) {
/* it's the only contour */
return 1;
}
/* check if this is the last contour */
/* encountered during a raster scan */
schar *i5;
int t = s;
while (true)
{
t = (t - 1) & 7;
i5 = i3 + deltas[t];
if (*i5 != 0)
break;
if (t == 0)
return 1;
}
}
if( (i4 == i0 && i3 == i1) )
break;
i3 = i4;
s = (s + 4) & 7;
} /* end of border following loop */
}
return i3 == stop_ptr;
else {
return i3 == stop_ptr;
}
return 0;
}