imgproc: C-API cleanup, drawContours refactor #25564
Merged
+210
−120
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes:
CV_TERMCRIT_*
andCV_CMP_*
)drawContours
to use C++ API instead of callingcvDrawContours
+ test for filled contours with holes (case with non-filled contours is simpler and is covered in some other tests)Note:
There is one case where old drawContours behavior doesn't match the new one - when
contourIdx == -1
(means "draw all contours") andmaxLevel == 0
(means draw only selected contours, but not what is inside).From the docs:
Old behavior - only one first contour is drawn:
New behavior (also expected by the test) - all contours are drawn: