Merge branch 4.x

modules/objdetect/misc/java/filelist_common

@@ -0,0 +1 @@
+misc/java/src/cpp/objdetect_converters.hpp

modules/objdetect/misc/java/gen_dict.json

@@ -0,0 +1,69 @@
+{
+    "ManualFuncs" : {
+        "QRCodeEncoder" : {
+            "QRCodeEncoder" : {
+                "j_code"   : [
+                    "\n",
+                    "/** Generates QR code from input string.",
+                    "@param encoded_info Input bytes to encode.",
+                    "@param qrcode Generated QR code.",
+                    "*/",
+                    "public void encode(byte[] encoded_info, Mat qrcode) {",
+                    "    encode_1(nativeObj, encoded_info, qrcode.nativeObj);",
+                    "}",
+                    "\n"
+                ],
+                "jn_code": [
+                    "\n",
+                    "private static native void encode_1(long nativeObj, byte[] encoded_info, long qrcode_nativeObj);",
+                    "\n"
+                ],
+                "cpp_code": [
+                    "//",
+                    "//  void cv::QRCodeEncoder::encode(String encoded_info, Mat& qrcode)",
+                    "//",
+                    "\n",
+                    "JNIEXPORT void JNICALL Java_org_opencv_objdetect_QRCodeEncoder_encode_11 (JNIEnv*, jclass, jlong, jbyteArray, jlong);",
+                    "\n",
+                    "JNIEXPORT void JNICALL Java_org_opencv_objdetect_QRCodeEncoder_encode_11",
+                    "(JNIEnv* env, jclass , jlong self, jbyteArray encoded_info, jlong qrcode_nativeObj)",
+                    "{",
+                    "",
+                    "    static const char method_name[] = \"objdetect::encode_11()\";",
+                    "    try {",
+                    "        LOGD(\"%s\", method_name);",
+                    "        Ptr<cv::QRCodeEncoder>* me = (Ptr<cv::QRCodeEncoder>*) self; //TODO: check for NULL",
+                    "        const char* n_encoded_info = reinterpret_cast<char*>(env->GetByteArrayElements(encoded_info, NULL));",
+                    "        const jsize n_encoded_info_size = env->GetArrayLength(encoded_info);",
+                    "        Mat& qrcode = *((Mat*)qrcode_nativeObj);",
+                    "        (*me)->encode( std::string(n_encoded_info, n_encoded_info_size), qrcode );",
+                    "    } catch(const std::exception &e) {",
+                    "        throwJavaException(env, &e, method_name);",
+                    "    } catch (...) {",
+                    "        throwJavaException(env, 0, method_name);",
+                    "    }",
+                    "}",
+                    "\n"
+                ]
+            }
+        }
+    },
+    "type_dict": {
+        "NativeByteArray": {
+            "j_type" : "byte[]",
+            "jn_type": "byte[]",
+            "jni_type": "jbyteArray",
+            "jni_name": "n_%(n)s",
+            "jni_var": "jbyteArray n_%(n)s = env->NewByteArray(static_cast<jsize>(%(n)s.size())); env->SetByteArrayRegion(n_%(n)s, 0, static_cast<jsize>(%(n)s.size()), reinterpret_cast<const jbyte*>(%(n)s.c_str()));",
+            "cast_from": "std::string"
+        },
+        "vector_NativeByteArray": {
+            "j_type": "List<byte[]>",
+            "jn_type": "List<byte[]>",
+            "jni_type": "jobject",
+            "jni_var": "std::vector< std::string > %(n)s",
+            "suffix": "Ljava_util_List",
+            "v_type": "vector_NativeByteArray"
+        }
+    }
+}

modules/objdetect/misc/java/src/cpp/objdetect_converters.cpp

@@ -0,0 +1,20 @@
+#include "objdetect_converters.hpp"
+
+#define LOG_TAG "org.opencv.objdetect"
+
+void Copy_vector_NativeByteArray_to_List(JNIEnv* env, std::vector<std::string>& vs, jobject list)
+{
+    static jclass juArrayList       = ARRAYLIST(env);
+    jmethodID m_clear     = LIST_CLEAR(env, juArrayList);
+    jmethodID m_add       = LIST_ADD(env, juArrayList);
+
+    env->CallVoidMethod(list, m_clear);
+    for (std::vector<std::string>::iterator it = vs.begin(); it != vs.end(); ++it)
+    {
+        jsize sz = static_cast<jsize>((*it).size());
+        jbyteArray element = env->NewByteArray(sz);
+        env->SetByteArrayRegion(element, 0, sz, reinterpret_cast<const jbyte*>((*it).c_str()));
+        env->CallBooleanMethod(list, m_add, element);
+        env->DeleteLocalRef(element);
+    }
+}

modules/objdetect/misc/java/src/cpp/objdetect_converters.hpp

@@ -0,0 +1,14 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html
+
+#ifndef OBJDETECT_CONVERTERS_HPP
+#define	OBJDETECT_CONVERTERS_HPP
+
+#include <jni.h>
+#include "opencv_java.hpp"
+#include "opencv2/core.hpp"
+
+void Copy_vector_NativeByteArray_to_List(JNIEnv* env, std::vector<std::string>& vs, jobject list);
+
+#endif	/* OBJDETECT_CONVERTERS_HPP */

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

@@ -2,13 +2,19 @@ package org.opencv.test.objdetect;
 
 import java.util.List;
 import org.opencv.core.Mat;
+import org.opencv.core.Size;
 import org.opencv.objdetect.QRCodeDetector;
+import org.opencv.objdetect.QRCodeEncoder;
+import org.opencv.objdetect.QRCodeEncoder_Params;
 import org.opencv.imgcodecs.Imgcodecs;
+import org.opencv.imgproc.Imgproc;
 import org.opencv.test.OpenCVTestCase;
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
 
 public class QRCodeDetectorTest extends OpenCVTestCase {
 
@@ -50,4 +56,26 @@ public class QRCodeDetectorTest extends OpenCVTestCase {
         List < String > expectedResults = Arrays.asList("SKIP", "EXTRA", "TWO STEPS FORWARD", "STEP BACK", "QUESTION", "STEP FORWARD");
         assertEquals(new HashSet<String>(output), new HashSet<String>(expectedResults));
     }
+
+    public void testKanji() {
+        byte[] inp = new byte[]{(byte)0x82, (byte)0xb1, (byte)0x82, (byte)0xf1, (byte)0x82, (byte)0xc9, (byte)0x82,
+                                (byte)0xbf, (byte)0x82, (byte)0xcd, (byte)0x90, (byte)0xa2, (byte)0x8a, (byte)0x45};
+        QRCodeEncoder_Params params = new QRCodeEncoder_Params();
+        params.set_mode(QRCodeEncoder.MODE_KANJI);
+        QRCodeEncoder encoder = QRCodeEncoder.create(params);
+
+        Mat qrcode = new Mat();
+        encoder.encode(inp, qrcode);
+        Imgproc.resize(qrcode, qrcode, new Size(0, 0), 2, 2, Imgproc.INTER_NEAREST);
+
+        QRCodeDetector detector = new QRCodeDetector();
+        byte[] output = detector.detectAndDecodeBytes(qrcode);
+        assertEquals(detector.getEncoding(), QRCodeEncoder.ECI_SHIFT_JIS);
+        assertArrayEquals(inp, output);
+
+        List < byte[] > outputs = new ArrayList< byte[] >();
+        assertTrue(detector.detectAndDecodeBytesMulti(qrcode, outputs));
+        assertEquals(detector.getEncoding(0), QRCodeEncoder.ECI_SHIFT_JIS);
+        assertArrayEquals(inp, outputs.get(0));
+    }
 }

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)