-
-
Notifications
You must be signed in to change notification settings - Fork 55.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
imgproc: C-API cleanup, drawContours refactor #25564
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
For some reason ABI verification has failed on buildbot, it complains two function has been removed: https://pullrequest.opencv.org/buildbot/builders/precommit_linux64/builds/107321/steps/Compare%20ABI%20dumps/logs/report-html The problem is related to the changes in this PR, but I'm not sure if this is a severe issue. |
ABI check has been updated. |
imgproc: C-API cleanup, drawContours refactor opencv#25564 Changes: * moved several macros from types_c.h to cvdef.h (assuming we will continue using them) * removed some cases of C-API usage in _imgproc_ module (`CV_TERMCRIT_*` and `CV_CMP_*`) * refactored `drawContours` to use C++ API instead of calling `cvDrawContours` + test for filled contours with holes (case with non-filled contours is simpler and is covered in some other tests) There is one case where old drawContours behavior doesn't match the new one - when `contourIdx == -1` (means "draw all contours") and `maxLevel == 0` (means draw only selected contours, but not what is inside). From the docs: > **contourIdx** Parameter indicating a contour to draw. If it is negative, all the contours are drawn. > **maxLevel** Maximal level for drawn contours. If it is 0, only the specified contour is drawn. If it is 1, the function draws the contour(s) and all the nested contours. If it is 2, the function draws the contours, all the nested contours, all the nested-to-nested contours, and so on. This parameter is only taken into account when there is hierarchy available. Old behavior - only one first contour is drawn: ![actual_screenshot_08 05 2024](https://github.com/opencv/opencv/assets/3304494/d0ae1d64-ddad-46bb-8acc-6f696874f71b) a New behavior (also expected by the test) - all contours are drawn: ![expected_screenshot_08 05 2024](https://github.com/opencv/opencv/assets/3304494/57ccd980-9dde-4006-90ee-19d6ce76912a)
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: