Merge branch 4.x

modules/objdetect/misc/python/pyopencv_objdetect.hpp

@@ -8,4 +8,31 @@ typedef std::vector<cv::Ptr<mcc::CChecker>> vector_Ptr_CChecker;
 typedef dnn::Net dnn_Net;
 #endif
 
+class NativeByteArray
+{
+public:
+    inline NativeByteArray& operator=(const std::string& from) {
+        val = from;
+        return *this;
+    }
+    std::string val;
+};
+
+class vector_NativeByteArray : public std::vector<std::string> {};
+
+template<>
+PyObject* pyopencv_from(const NativeByteArray& from)
+{
+    return PyBytes_FromStringAndSize(from.val.c_str(), from.val.size());
+}
+
+template<>
+PyObject* pyopencv_from(const vector_NativeByteArray& results)
+{
+    PyObject* list = PyList_New(results.size());
+    for(size_t i = 0; i < results.size(); ++i)
+        PyList_SetItem(list, i, PyBytes_FromStringAndSize(results[i].c_str(), results[i].size()));
+    return list;
+}
+
 #endif

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

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #!/usr/bin/env python
 '''
 ===============================================================================
@@ -8,7 +9,7 @@ import os
 import numpy as np
 import cv2 as cv
 
-from tests_common import NewOpenCVTests
+from tests_common import NewOpenCVTests, unittest
 
 class qrcode_detector_test(NewOpenCVTests):
 
@@ -50,3 +51,36 @@ class qrcode_detector_test(NewOpenCVTests):
         self.assertTrue("STEP BACK" in decoded_data)
         self.assertTrue("QUESTION" in decoded_data)
         self.assertEqual(points.shape, (6, 4, 2))
+
+    def test_decode_non_ascii(self):
+        import sys
+        if sys.version_info[0] < 3:
+            raise unittest.SkipTest('Python 2.x is not supported')
+
+        img = cv.imread(os.path.join(self.extraTestDataPath, 'cv/qrcode/umlaut.png'))
+        self.assertFalse(img is None)
+        detector = cv.QRCodeDetector()
+        decoded_data, _, _ = detector.detectAndDecode(img)
+        self.assertTrue(isinstance(decoded_data, str))
+        self.assertTrue("Müllheimstrasse" in decoded_data)
+
+    def test_kanji(self):
+        inp = "こんにちは世界"
+        inp_bytes = inp.encode("shift-jis")
+
+        params = cv.QRCodeEncoder_Params()
+        params.mode = cv.QRCodeEncoder_MODE_KANJI
+        encoder = cv.QRCodeEncoder_create(params)
+        qrcode = encoder.encode(inp_bytes)
+        qrcode = cv.resize(qrcode, (0, 0), fx=2, fy=2, interpolation=cv.INTER_NEAREST)
+
+        detector = cv.QRCodeDetector()
+        data, _, _ = detector.detectAndDecodeBytes(qrcode)
+        self.assertEqual(data, inp_bytes)
+        self.assertEqual(detector.getEncoding(), cv.QRCodeEncoder_ECI_SHIFT_JIS)
+        self.assertEqual(data.decode("shift-jis"), inp)
+
+        _, data, _, _ = detector.detectAndDecodeBytesMulti(qrcode)
+        self.assertEqual(data[0], inp_bytes)
+        self.assertEqual(detector.getEncoding(0), cv.QRCodeEncoder_ECI_SHIFT_JIS)
+        self.assertEqual(data[0].decode("shift-jis"), inp)