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

modules/objdetect/misc/java/test/QRCodeDetectorTest.java

@@ -3,9 +3,7 @@ package org.opencv.test.objdetect;
 import org.opencv.core.Mat;
 import org.opencv.objdetect.QRCodeDetector;
 import org.opencv.imgcodecs.Imgcodecs;
-import org.opencv.objdetect.Objdetect;
 import org.opencv.test.OpenCVTestCase;
-import org.opencv.test.OpenCVTestRunner;
 
 public class QRCodeDetectorTest extends OpenCVTestCase {
 

modules/objdetect/misc/python/test/test_qrcode_detect.py

@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+'''
+===============================================================================
+QR code detect and decode pipeline.
+===============================================================================
+'''
+
+import numpy as np
+import cv2 as cv
+
+from tests_common import NewOpenCVTests
+
+class qrcode_detector_test(NewOpenCVTests):
+    def test_detect_and_decode(self):
+        img = cv.imread(self.extraTestDataPath + '/cv/qrcode/link_ocv.jpg')
+        detector = cv.QRCodeDetector()
+        retval, points, straight_qrcode = detector.detectAndDecode(img)
+        self.assertEqual(retval, "https://opencv.org/");

modules/objdetect/src/qrcode.cpp

@@ -1068,7 +1068,6 @@ std::string QRCodeDetector::decode(InputArray in, InputArray points,
         inarr = gray;
     }
 
-    CV_Assert(points.isVector());
     vector<Point2f> src_points;
     points.copyTo(src_points);
     CV_Assert(src_points.size() == 4);