Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2020-02-04 19:49:24 +03:00
parent 0dd1ce1a4f 0cb3bf95f1
commit 225566da7b
14 changed files with 577 additions and 611 deletions
@@ -2289,7 +2289,8 @@ bool QRCodeDetector::decodeMulti(
    CV_Assert((points.size().width % 4) == 0);
    vector< vector< Point2f > > src_points ;
    Mat qr_points = points.getMat();
-    for (int i = 0; i < points.size().width ; i += 4)
+    qr_points = qr_points.reshape(2, 1);
+    for (int i = 0; i < qr_points.size().width ; i += 4)
    {
        vector<Point2f> tempMat = qr_points.colRange(i, i + 4);
        if (contourArea(tempMat) > 0.0)