From 638c575c73d8380fbc784b7cea804d86410d3677 Mon Sep 17 00:00:00 2001 From: Yuriy Chernyshov Date: Fri, 15 Sep 2023 12:37:43 +0300 Subject: [PATCH] More fixes for iterators-are-pointers case --- modules/calib3d/src/checkchessboard.cpp | 9 +++------ .../src/aruco/apriltag/apriltag_quad_thresh.cpp | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/calib3d/src/checkchessboard.cpp b/modules/calib3d/src/checkchessboard.cpp index 97876d218c..350614e78f 100644 --- a/modules/calib3d/src/checkchessboard.cpp +++ b/modules/calib3d/src/checkchessboard.cpp @@ -55,15 +55,12 @@ static void icvGetQuadrangleHypotheses(const std::vector >::const_iterator iter_t; - iter_t i; - for (i = contours.begin(); i != contours.end(); ++i) + for (size_t i = 0; i < contours.size(); ++i) { - const iter_t::difference_type idx = i - contours.begin(); - if (hierarchy.at(idx)[3] != -1) + if (hierarchy.at(i)[3] != -1) continue; // skip holes - const std::vector< cv::Point > & c = *i; + const std::vector< cv::Point > & c = contours[i]; cv::RotatedRect box = cv::minAreaRect(c); float box_size = MAX(box.size.width, box.size.height); diff --git a/modules/objdetect/src/aruco/apriltag/apriltag_quad_thresh.cpp b/modules/objdetect/src/aruco/apriltag/apriltag_quad_thresh.cpp index 38d1b2ffb8..96b7fe517e 100644 --- a/modules/objdetect/src/aruco/apriltag/apriltag_quad_thresh.cpp +++ b/modules/objdetect/src/aruco/apriltag/apriltag_quad_thresh.cpp @@ -349,7 +349,7 @@ int quad_segment_maxima(const DetectorParameters &td, int sz, struct line_fit_pt } y[iy] = acc; } - copy(y.begin(), y.end(), errs.begin()); + std::copy(y.begin(), y.end(), errs.begin()); } std::vector maxima(sz);