mirror of
https://github.com/opencv/opencv.git
synced 2025-01-12 15:49:32 +08:00
6350bfbf79
imgproc: C-API cleanup, drawContours refactor #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) #### Note: 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:  a New behavior (also expected by the test) - all contours are drawn:  |
||
|---|---|---|
| .. | ||
| ocl | ||
| test_approxpoly.cpp | ||
| test_bilateral_filter.cpp | ||
| test_boundingrect.cpp | ||
| test_canny.cpp | ||
| test_color.cpp | ||
| test_connectedcomponents.cpp | ||
| test_contours_new.cpp | ||
| test_contours.cpp | ||
| test_convhull.cpp | ||
| test_cornersubpix.cpp | ||
| test_cvtyuv.cpp | ||
| test_distancetransform.cpp | ||
| test_drawing.cpp | ||
| test_emd.cpp | ||
| test_filter.cpp | ||
| test_fitellipse_ams.cpp | ||
| test_fitellipse_direct.cpp | ||
| test_fitellipse.cpp | ||
| test_floodfill.cpp | ||
| test_goodfeaturetotrack.cpp | ||
| test_grabcut.cpp | ||
| test_histograms.cpp | ||
| test_houghcircles.cpp | ||
| test_houghlines.cpp | ||
| test_imgproc_umat.cpp | ||
| test_imgwarp_strict.cpp | ||
| test_imgwarp.cpp | ||
| test_intelligent_scissors.cpp | ||
| test_intersectconvexconvex.cpp | ||
| test_intersection.cpp | ||
| test_lsd.cpp | ||
| test_main.cpp | ||
| test_moments.cpp | ||
| test_pc.cpp | ||
| test_precomp.hpp | ||
| test_pyramid.cpp | ||
| test_resize_bitexact.cpp | ||
| test_smooth_bitexact.cpp | ||
| test_stackblur.cpp | ||
| test_subdivision2d.cpp | ||
| test_templmatch.cpp | ||
| test_templmatchmask.cpp | ||
| test_thresh.cpp | ||
| test_watershed.cpp | ||