Merge branch 4.x

Author: asmorkalov

modules/ccalib/src/omnidir.cpp

@@ -2139,7 +2139,7 @@ void cv::omnidir::internal::flags2idxStereo(int flags, std::vector<int>& idx, in
     }
 }
 
-// fill in zerso for fixed parameters
+// fill in zeros for fixed parameters
 void cv::omnidir::internal::fillFixed(Mat&G, int flags, int n)
 {
     Mat tmp = G.clone();

modules/wechat_qrcode/src/zxing/qrcode/detector/detector.cpp

@@ -117,7 +117,7 @@ Ref<DetectorResult> Detector::getResultViaAlignment(int patternIdx, int alignmen
     Ref<BitMatrix> bits(sampleGrid(image_, possibleDimension, transform, err_handler));
     if (err_handler.ErrCode()) return Ref<DetectorResult>();
 
-    ArrayRef<Ref<ResultPoint> > corrners(new Array<Ref<ResultPoint> >(4));
+    ArrayRef<Ref<ResultPoint> > corners(new Array<Ref<ResultPoint> >(4));
     vector<float> points(8, 0.0f);
     points[0] = 0.0f;
     points[1] = possibleDimension;  // bottomLeft
@@ -128,12 +128,12 @@ Ref<DetectorResult> Detector::getResultViaAlignment(int patternIdx, int alignmen
     points[6] = possibleDimension;
     points[7] = possibleDimension;  // bottomRight
     transform->transformPoints(points);
-    corrners[0].reset(Ref<FinderPattern>(new FinderPattern(points[0], points[1], 0)));
-    corrners[1].reset(Ref<FinderPattern>(new FinderPattern(points[2], points[3], 0)));
-    corrners[2].reset(Ref<FinderPattern>(new FinderPattern(points[4], points[5], 0)));
-    corrners[3].reset(Ref<FinderPattern>(new FinderPattern(points[6], points[7], 0)));
+    corners[0].reset(Ref<FinderPattern>(new FinderPattern(points[0], points[1], 0)));
+    corners[1].reset(Ref<FinderPattern>(new FinderPattern(points[2], points[3], 0)));
+    corners[2].reset(Ref<FinderPattern>(new FinderPattern(points[4], points[5], 0)));
+    corners[3].reset(Ref<FinderPattern>(new FinderPattern(points[6], points[7], 0)));
 
-    Ref<DetectorResult> result(new DetectorResult(bits, corrners, possibleDimension));
+    Ref<DetectorResult> result(new DetectorResult(bits, corners, possibleDimension));
     return result;
 }
 

modules/ximgproc/src/find_ellipses.cpp

@@ -338,9 +338,9 @@ float EllipseDetectorImpl::getMedianSlope(std::vector<Point2f> &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<Point> &e1, std::vector<Poin
                 iIdx += iSzBin;
             }
         } else
-            iota(indexes.begin(), indexes.end(), hsize_2);
+            std::iota(indexes.begin(), indexes.end(), hsize_2);
 
         for (uint ii = 0; ii < minPoints; ii++) {
             uint i = indexes[ii];
@@ -483,7 +483,7 @@ void EllipseDetectorImpl::getFastCenter(std::vector<Point> &e1, std::vector<Poin
                 iIdx += iSzBin;
             }
         } else
-            iota(indexes.begin(), indexes.end(), hsize_1);
+            std::iota(indexes.begin(), indexes.end(), hsize_1);
 
 
         for (uint ii = 0; ii < minPoints; ii++) {
@@ -740,7 +740,7 @@ void EllipseDetectorImpl::detectEdges13(Mat1b &DP, VVP &points_1, VVP &points_3)
         }
 
         // order edge points of the same arc
-        sort(edgeSegment.begin(), edgeSegment.end(), sortPoint);
+        std::sort(edgeSegment.begin(), edgeSegment.end(), sortPoint);
         int edgeSegmentSize = unsigned(edgeSegment.size());
 
         // get extrema of the arc
@@ -788,7 +788,7 @@ void EllipseDetectorImpl::detectEdges24(Mat1b &DN, VVP &points_2, VVP &points_4)
         }
 
         // order edge points of the same arc
-        sort(edgeSegment.begin(), edgeSegment.end(), sortPoint);
+        std::sort(edgeSegment.begin(), edgeSegment.end(), sortPoint);
         int edgeSegmentSize = unsigned(edgeSegment.size());
 
         // get extrema of the arc
@@ -840,7 +840,7 @@ void EllipseDetectorImpl::getTriplets124(VVP &pi, VVP &pj, VVP &pk,
 
         // 1 -> 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<uint, EllipseData>(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<uint, EllipseData>(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<Ellipse> &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;

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() );

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)

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<Point2f>(i), to_mat.at<Point2f>(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<SHRT_MAX);

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;