Merge pull request #25385 from asmorkalov:as/new_contours_cleanup

asmorkalov · web-flow · commit cf3a130be6db · 2024-04-10T12:48:12.000+03:00
Removed old C API usage in new findContours implementation
diff --git a/modules/imgproc/src/contours_new.cpp b/modules/imgproc/src/contours_new.cpp
@@ -297,7 +297,7 @@ struct ContourScanner_
     ~ContourScanner_() {}
     inline bool isInt() const
     {
-        return (this->mode == CV_RETR_FLOODFILL);
+        return (this->mode == RETR_FLOODFILL);
     }
     inline bool isSimple() const
     {
@@ -355,7 +355,7 @@ shared_ptr<ContourScanner_> ContourScanner_::create(Mat img, int mode, int metho
     root.body.brect = Rect(Point(0, 0), size);
     scanner->ctable.fill(-1);
     scanner->approx_method2 = scanner->approx_method1 = method;
-    if (method == CV_CHAIN_APPROX_TC89_L1 || method == CV_CHAIN_APPROX_TC89_KCOS)
+    if (method == CHAIN_APPROX_TC89_L1 || method == CHAIN_APPROX_TC89_KCOS)
         scanner->approx_method1 = CV_CHAIN_CODE;
     return scanner;
 }
@@ -454,7 +454,7 @@ bool ContourScanner_::contourScan(const int prev, int& p, Point& last_pos, const
 
     /* find contour parent */
     int main_parent = -1;
-    if (isSimple() || (!is_hole && (mode == CV_RETR_CCOMP || mode == CV_RETR_FLOODFILL)) ||
+    if (isSimple() || (!is_hole && (mode == RETR_CCOMP || mode == RETR_FLOODFILL)) ||
         last_pos.x <= 0)
     {
         main_parent = 0;
diff --git a/modules/imgproc/test/test_contours.cpp b/modules/imgproc/test/test_contours.cpp
@@ -39,7 +39,6 @@
 //
 //M*/
 
-#include "opencv2/imgproc/types_c.h"
 #include "test_precomp.hpp"
 #include <opencv2/highgui.hpp>
 
diff --git a/modules/imgproc/test/test_contours_new.cpp b/modules/imgproc/test/test_contours_new.cpp
@@ -2,7 +2,6 @@
 // It is subject to the license terms in the LICENSE file found in the top-level directory
 // of this distribution and at https://opencv.org/license.html
 
-#include "opencv2/imgproc/types_c.h"
 #include "test_precomp.hpp"
 #include "opencv2/ts/ocl_test.hpp"
 #include "opencv2/imgproc/detail/legacy.hpp"

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ struct ContourScanner_`
`297`	`297`	`~ContourScanner_() {}`
`298`	`298`	`inline bool isInt() const`
`299`	`299`	`{`
`300`		`- return (this->mode == CV_RETR_FLOODFILL);`
	`300`	`+ return (this->mode == RETR_FLOODFILL);`
`301`	`301`	`}`
`302`	`302`	`inline bool isSimple() const`
`303`	`303`	`{`
`@@ -355,7 +355,7 @@ shared_ptr<ContourScanner_> ContourScanner_::create(Mat img, int mode, int metho`
`355`	`355`	`root.body.brect = Rect(Point(0, 0), size);`
`356`	`356`	`scanner->ctable.fill(-1);`
`357`	`357`	`scanner->approx_method2 = scanner->approx_method1 = method;`
`358`		`- if (method == CV_CHAIN_APPROX_TC89_L1 \|\| method == CV_CHAIN_APPROX_TC89_KCOS)`
	`358`	`+ if (method == CHAIN_APPROX_TC89_L1 \|\| method == CHAIN_APPROX_TC89_KCOS)`
`359`	`359`	`scanner->approx_method1 = CV_CHAIN_CODE;`
`360`	`360`	`return scanner;`
`361`	`361`	`}`
`@@ -454,7 +454,7 @@ bool ContourScanner_::contourScan(const int prev, int& p, Point& last_pos, const`
`454`	`454`
`455`	`455`	`/* find contour parent */`
`456`	`456`	`int main_parent = -1;`
`457`		`- if (isSimple() \|\| (!is_hole && (mode == CV_RETR_CCOMP \|\| mode == CV_RETR_FLOODFILL)) \|\|`
	`457`	`+ if (isSimple() \|\| (!is_hole && (mode == RETR_CCOMP \|\| mode == RETR_FLOODFILL)) \|\|`
`458`	`458`	`last_pos.x <= 0)`
`459`	`459`	`{`
`460`	`460`	`main_parent = 0;`