mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-13 04:52:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #25385 from asmorkalov:as/new_contours_cleanup

Browse Source 
Removed old C API usage in new findContours implementation
This commit is contained in:
Alexander Smorkalov 2024-04-10 12:48:12 +03:00 committed by GitHub
commit cf3a130be6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/imgproc/src/contours_new.cpp
View File

@ -297,7 +297,7 @@ public:
~ContourScanner_() {} ~ContourScanner_() {}
inline bool isInt() const inline bool isInt() const
{ {
return (this->mode == CV_RETR_FLOODFILL); return (this->mode == RETR_FLOODFILL);
} }
inline bool isSimple() const 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); root.body.brect = Rect(Point(0, 0), size);
scanner->ctable.fill(-1); scanner->ctable.fill(-1);
scanner->approx_method2 = scanner->approx_method1 = method; 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; scanner->approx_method1 = CV_CHAIN_CODE;
return scanner; return scanner;
} }
@ -454,7 +454,7 @@ bool ContourScanner_::contourScan(const int prev, int& p, Point& last_pos, const
/* find contour parent */ /* find contour parent */
int main_parent = -1; 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) last_pos.x <= 0)
{ {
main_parent = 0; main_parent = 0;

1
modules/imgproc/test/test_contours.cpp
View File

@ -39,7 +39,6 @@
// //
//M*/ //M*/
#include "opencv2/imgproc/types_c.h"
#include "test_precomp.hpp" #include "test_precomp.hpp"
#include <opencv2/highgui.hpp> #include <opencv2/highgui.hpp>

1
modules/imgproc/test/test_contours_new.cpp
View File

@ -2,7 +2,6 @@
// It is subject to the license terms in the LICENSE file found in the top-level directory // It is subject to the license terms in the LICENSE file found in the top-level directory
// of this distribution and at http://opencv.org/license.html // of this distribution and at http://opencv.org/license.html
#include "opencv2/imgproc/types_c.h"
#include "test_precomp.hpp" #include "test_precomp.hpp"
#include "opencv2/ts/ocl_test.hpp" #include "opencv2/ts/ocl_test.hpp"
#include "opencv2/imgproc/detail/legacy.hpp" #include "opencv2/imgproc/detail/legacy.hpp"