From 09b02b9e4eb087b39b14919d23e196fc6442ffec Mon Sep 17 00:00:00 2001 From: lianst <563052165@qq.com> Date: Wed, 30 Nov 2022 23:46:58 +0800 Subject: [PATCH 1/3] Corrected misspelling --- .../src/zxing/qrcode/detector/detector.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/wechat_qrcode/src/zxing/qrcode/detector/detector.cpp b/modules/wechat_qrcode/src/zxing/qrcode/detector/detector.cpp index e22a852f9..40c1f5726 100644 --- a/modules/wechat_qrcode/src/zxing/qrcode/detector/detector.cpp +++ b/modules/wechat_qrcode/src/zxing/qrcode/detector/detector.cpp @@ -117,7 +117,7 @@ Ref Detector::getResultViaAlignment(int patternIdx, int alignmen Ref bits(sampleGrid(image_, possibleDimension, transform, err_handler)); if (err_handler.ErrCode()) return Ref(); - ArrayRef > corrners(new Array >(4)); + ArrayRef > corners(new Array >(4)); vector points(8, 0.0f); points[0] = 0.0f; points[1] = possibleDimension; // bottomLeft @@ -128,12 +128,12 @@ Ref Detector::getResultViaAlignment(int patternIdx, int alignmen points[6] = possibleDimension; points[7] = possibleDimension; // bottomRight transform->transformPoints(points); - corrners[0].reset(Ref(new FinderPattern(points[0], points[1], 0))); - corrners[1].reset(Ref(new FinderPattern(points[2], points[3], 0))); - corrners[2].reset(Ref(new FinderPattern(points[4], points[5], 0))); - corrners[3].reset(Ref(new FinderPattern(points[6], points[7], 0))); + corners[0].reset(Ref(new FinderPattern(points[0], points[1], 0))); + corners[1].reset(Ref(new FinderPattern(points[2], points[3], 0))); + corners[2].reset(Ref(new FinderPattern(points[4], points[5], 0))); + corners[3].reset(Ref(new FinderPattern(points[6], points[7], 0))); - Ref result(new DetectorResult(bits, corrners, possibleDimension)); + Ref result(new DetectorResult(bits, corners, possibleDimension)); return result; } From 2f8938512dc12c0462c42f679b23dcf1c6d6acd8 Mon Sep 17 00:00:00 2001 From: Yuriy Chernyshov Date: Wed, 6 Sep 2023 18:04:53 +0300 Subject: [PATCH 2/3] Add missing std namespace qualifiers --- modules/ximgproc/src/find_ellipses.cpp | 34 +++++++++---------- modules/ximgproc/src/lsc.cpp | 2 +- .../ximgproc/src/run_length_morphology.cpp | 2 +- .../src/sparse_match_interpolators.cpp | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/ximgproc/src/find_ellipses.cpp b/modules/ximgproc/src/find_ellipses.cpp index 66c61d775..de73f833b 100644 --- a/modules/ximgproc/src/find_ellipses.cpp +++ b/modules/ximgproc/src/find_ellipses.cpp @@ -338,9 +338,9 @@ float EllipseDetectorImpl::getMedianSlope(std::vector &med, Point2f &ce slopes.push_back(num / den); } - nth_element(slopes.begin(), slopes.begin() + quarterSize, slopes.end()); - nth_element(xx.begin(), xx.begin() + halfSize, xx.end()); - nth_element(yy.begin(), yy.begin() + halfSize, yy.end()); + std::nth_element(slopes.begin(), slopes.begin() + quarterSize, slopes.end()); + std::nth_element(xx.begin(), xx.begin() + halfSize, xx.end()); + std::nth_element(yy.begin(), yy.begin() + halfSize, yy.end()); centers.x = xx[halfSize]; centers.y = yy[halfSize]; @@ -390,7 +390,7 @@ void EllipseDetectorImpl::getFastCenter(std::vector &e1, std::vector &e1, std::vector reverse 1 VP rev_i(edge_i.size()); - reverse_copy(edge_i.begin(), edge_i.end(), rev_i.begin()); + std::reverse_copy(edge_i.begin(), edge_i.end(), rev_i.begin()); // for each edge j for (ushort j = 0; j < sz_j; ++j) { @@ -936,7 +936,7 @@ void EllipseDetectorImpl::getTriplets231(VVP &pi, VVP &pj, VVP &pk, // 2 -> reverse 2 VP rev_i(edge_i.size()); - reverse_copy(edge_i.begin(), edge_i.end(), rev_i.begin()); + std::reverse_copy(edge_i.begin(), edge_i.end(), rev_i.begin()); // for each edge j for (ushort j = 0; j < sz_j; ++j) { @@ -958,7 +958,7 @@ void EllipseDetectorImpl::getTriplets231(VVP &pi, VVP &pj, VVP &pk, // 3 -> reverse 3 VP rev_j(edge_j.size()); - reverse_copy(edge_j.begin(), edge_j.end(), rev_j.begin()); + std::reverse_copy(edge_j.begin(), edge_j.end(), rev_j.begin()); uint key_ij = generateKey(PAIR_23, i, j); @@ -991,7 +991,7 @@ void EllipseDetectorImpl::getTriplets231(VVP &pi, VVP &pj, VVP &pk, if (data.count(key_ik) == 0) { // 1 -> reverse 1 VP rev_k(edge_k.size()); - reverse_copy(edge_k.begin(), edge_k.end(), rev_k.begin()); + std::reverse_copy(edge_k.begin(), edge_k.end(), rev_k.begin()); getFastCenter(edge_i, rev_k, data_ik); data.insert(std::pair(key_ik, data_ik)); @@ -1038,7 +1038,7 @@ void EllipseDetectorImpl::getTriplets342(VVP &pi, VVP &pj, VVP &pk, // 3 -> reverse 3 VP rev_i(edge_i.size()); - reverse_copy(edge_i.begin(), edge_i.end(), rev_i.begin()); + std::reverse_copy(edge_i.begin(), edge_i.end(), rev_i.begin()); // for each edge j for (ushort j = 0; j < sz_j; ++j) { @@ -1060,7 +1060,7 @@ void EllipseDetectorImpl::getTriplets342(VVP &pi, VVP &pj, VVP &pk, // 4 -> reverse 4 VP rev_j(edge_j.size()); - reverse_copy(edge_j.begin(), edge_j.end(), rev_j.begin()); + std::reverse_copy(edge_j.begin(), edge_j.end(), rev_j.begin()); uint key_ij = generateKey(PAIR_34, i, j); @@ -1093,7 +1093,7 @@ void EllipseDetectorImpl::getTriplets342(VVP &pi, VVP &pj, VVP &pk, if (data.count(key_ik) == 0) { // 2 -> reverse 2 VP rev_k(edge_k.size()); - reverse_copy(edge_k.begin(), edge_k.end(), rev_k.begin()); + std::reverse_copy(edge_k.begin(), edge_k.end(), rev_k.begin()); getFastCenter(rev_i, rev_k, data_ik); data.insert(std::pair(key_ik, data_ik)); @@ -1141,7 +1141,7 @@ void EllipseDetectorImpl::getTriplets413(VVP &pi, VVP &pj, VVP &pk, // 4 -> reverse 4 VP rev_i(edge_i.size()); - reverse_copy(edge_i.begin(), edge_i.end(), rev_i.begin()); + std::reverse_copy(edge_i.begin(), edge_i.end(), rev_i.begin()); // for each edge j for (ushort j = 0; j < sz_j; ++j) { @@ -1507,8 +1507,8 @@ void EllipseDetectorImpl::detect(Mat1b &image, std::vector &ellipses) { getTriplets342(points_3, points_4, points_2, centers, ellipses); getTriplets413(points_4, points_1, points_3, centers, ellipses); - // sort by score - sort(ellipses.begin(), ellipses.end()); + // std::sort by score + std::sort(ellipses.begin(), ellipses.end()); // free accumulator memory delete[]accN; diff --git a/modules/ximgproc/src/lsc.cpp b/modules/ximgproc/src/lsc.cpp index 9ef507c8f..1a5539b4f 100644 --- a/modules/ximgproc/src/lsc.cpp +++ b/modules/ximgproc/src/lsc.cpp @@ -821,7 +821,7 @@ inline void SuperpixelLSCImpl::PostEnforceLabelConnectivity( int threshold ) (*Stmp).Neighbor.insert( (*Stmp).Neighbor.end(), (*S).Neighbor.begin(), (*S).Neighbor.end() ); - sort( (*Stmp).Neighbor.begin(), (*Stmp).Neighbor.end() ); + std::sort( (*Stmp).Neighbor.begin(), (*Stmp).Neighbor.end() ); I = unique( (*Stmp).Neighbor.begin(), (*Stmp).Neighbor.end() ); (*Stmp).Neighbor.erase( I, (*Stmp).Neighbor.end() ); diff --git a/modules/ximgproc/src/run_length_morphology.cpp b/modules/ximgproc/src/run_length_morphology.cpp index 3cf880484..2819f51ec 100644 --- a/modules/ximgproc/src/run_length_morphology.cpp +++ b/modules/ximgproc/src/run_length_morphology.cpp @@ -388,7 +388,7 @@ static void convertInputArrayToRuns(InputArray& theArray, rlVec& runs, Size& the static void sortChords(rlVec& lChords) { - sort(lChords.begin(), lChords.end()); + std::sort(lChords.begin(), lChords.end()); } static void mergeNeighbouringChords(rlVec& rlIn, rlVec& rlOut) diff --git a/modules/ximgproc/src/sparse_match_interpolators.cpp b/modules/ximgproc/src/sparse_match_interpolators.cpp index 517573946..85261715b 100644 --- a/modules/ximgproc/src/sparse_match_interpolators.cpp +++ b/modules/ximgproc/src/sparse_match_interpolators.cpp @@ -198,7 +198,7 @@ void EdgeAwareInterpolatorImpl::interpolate(InputArray from_image, InputArray fr matches_vector[i] = SparseMatch(from_mat.at(i), to_mat.at(i)); - sort(matches_vector.begin(),matches_vector.end()); + std::sort(matches_vector.begin(),matches_vector.end()); match_num = (int)matches_vector.size(); CV_Assert(match_num Date: Fri, 15 Sep 2023 12:40:19 +0300 Subject: [PATCH 3/3] More fixes for iterators-are-pointers case --- modules/ximgproc/src/structured_edge_detection.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/ximgproc/src/structured_edge_detection.cpp b/modules/ximgproc/src/structured_edge_detection.cpp index ffd80660e..56070bef8 100644 --- a/modules/ximgproc/src/structured_edge_detection.cpp +++ b/modules/ximgproc/src/structured_edge_detection.cpp @@ -148,8 +148,9 @@ static cv::Mat rgb2luv(const cv::Mat &src) lTable[i] = l*maxi; } - for (int i = 0; i < 40; ++i) - lTable.push_back(*--lTable.end()); + for (int i = 0; i < 40; ++i) { + lTable.push_back(*lTable.rbegin()); + } const int nchannels = 3;