Merge branch 4.x

Author: alalek

modules/aruco/samples/tutorial_charuco_create_detect.cpp

@@ -21,7 +21,7 @@ static bool readCameraParameters(std::string filename, cv::Mat& camMatrix, cv::M
         return false;
     fs["camera_matrix"] >> camMatrix;
     fs["distortion_coefficients"] >> distCoeffs;
-    return true;
+    return (camMatrix.size() == cv::Size(3,3)) ;
 }
 
 void createBoard()
@@ -161,4 +161,4 @@ int main(int argc, char* argv[])
         break;
     }
     return 0;
-}
+}

modules/barcode/CMakeLists.txt

@@ -0,0 +1,2 @@
+set(the_description "Barcode Detection and Decoding")
+ocv_define_module(barcode opencv_core opencv_imgproc opencv_dnn WRAP python java)

modules/barcode/README.md

@@ -0,0 +1,9 @@
+1D Barcode Detect and Decode
+======================
+
+This module is focused on detecting and decoding barcode from image. It is mainly designed for scanning the images, locating barcode, decoding barcode and outputting its decoded result.
+
+1. Support 1-dimension bar code detection of any angle tilting.
+2. Support multi-scale detection.
+3. Support EAN-13, EAN-8 and UPC-A decode yet.
+4. With x86 CPU, it achieves 50FPS averagely.

modules/barcode/doc/barcode.bib

@@ -0,0 +1,28 @@
+@mastersthesis{Xiangmin2015research,
+  title={Research on Barcode Recognition Technology In a Complex Background},
+  author={Xiangmin, Wang},
+  year={2015},
+  school={Huazhong University of Science and Technology}
+}
+
+@article{bazen2002systematic,
+  title={Systematic methods for the computation of the directional fields and singular points of fingerprints},
+  author={Bazen, Asker M and Gerez, Sabih H},
+  journal={IEEE transactions on pattern analysis and machine intelligence},
+  volume={24},
+  number={7},
+  pages={905--919},
+  year={2002},
+  publisher={IEEE}
+}
+
+@article{kass1987analyzing,
+  title={Analyzing oriented patterns},
+  author={Kass, Michael and Witkin, Andrew},
+  journal={Computer vision, graphics, and image processing},
+  volume={37},
+  number={3},
+  pages={362--385},
+  year={1987},
+  publisher={Elsevier}
+}

modules/barcode/include/opencv2/barcode.hpp

@@ -0,0 +1,101 @@
+// 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.
+// Copyright (c) 2020-2021 darkliang wangberlinT Certseeds
+
+#ifndef __OPENCV_BARCODE_HPP__
+#define __OPENCV_BARCODE_HPP__
+
+#include <opencv2/core.hpp>
+#include <ostream>
+
+/** @defgroup barcode Barcode detecting and decoding methods
+*/
+
+namespace cv {
+namespace barcode {
+
+//! @addtogroup barcode
+//! @{
+
+enum BarcodeType
+{
+    NONE, EAN_8, EAN_13, UPC_A, UPC_E, UPC_EAN_EXTENSION
+};
+
+static inline std::ostream &operator<<(std::ostream &out, const BarcodeType &barcode_type)
+{
+    switch (barcode_type)
+    {
+        case BarcodeType::EAN_8:
+            out << "EAN_8";
+            break;
+        case BarcodeType::EAN_13:
+            out << "EAN_13";
+            break;
+        case BarcodeType::UPC_E:
+            out << "UPC_E";
+            break;
+        case BarcodeType::UPC_A:
+            out << "UPC_A";
+            break;
+        case BarcodeType::UPC_EAN_EXTENSION:
+            out << "UPC_EAN_EXTENSION";
+            break;
+        default:
+            out << "NONE";
+    }
+    return out;
+}
+
+class CV_EXPORTS_W BarcodeDetector
+{
+public:
+    /**
+     * @brief Initialize the BarcodeDetector.
+     * @param prototxt_path prototxt file path for the super resolution model
+     * @param model_path model file path for the super resolution model
+     */
+    CV_WRAP BarcodeDetector(const std::string &prototxt_path = "", const std::string &model_path = "");
+
+    ~BarcodeDetector();
+
+    /** @brief Detects Barcode in image and returns the rectangle(s) containing the code.
+     *
+     * @param img grayscale or color (BGR) image containing (or not) Barcode.
+     * @param points Output vector of vector of vertices of the minimum-area rotated rectangle containing the codes.
+     * For N detected barcodes, the dimensions of this array should be [N][4].
+     * Order of four points in vector< Point2f> is bottomLeft, topLeft, topRight, bottomRight.
+     */
+    CV_WRAP bool detect(InputArray img, OutputArray points) const;
+
+    /** @brief Decodes barcode in image once it's found by the detect() method.
+     *
+     * @param img grayscale or color (BGR) image containing bar code.
+     * @param points vector of rotated rectangle vertices found by detect() method (or some other algorithm).
+     * For N detected barcodes, the dimensions of this array should be [N][4].
+     * Order of four points in vector<Point2f> is bottomLeft, topLeft, topRight, bottomRight.
+     * @param decoded_info UTF8-encoded output vector of string or empty vector of string if the codes cannot be decoded.
+     * @param decoded_type vector of BarcodeType, specifies the type of these barcodes
+     */
+    CV_WRAP bool decode(InputArray img, InputArray points, CV_OUT std::vector<std::string> &decoded_info, CV_OUT
+                        std::vector<BarcodeType> &decoded_type) const;
+
+    /** @brief Both detects and decodes barcode
+
+     * @param img grayscale or color (BGR) image containing barcode.
+     * @param decoded_info UTF8-encoded output vector of string(s) or empty vector of string if the codes cannot be decoded.
+     * @param decoded_type vector of BarcodeType, specifies the type of these barcodes
+     * @param points optional output vector of vertices of the found  barcode rectangle. Will be empty if not found.
+     */
+    CV_WRAP bool detectAndDecode(InputArray img, CV_OUT std::vector<std::string> &decoded_info, CV_OUT
+                                 std::vector<BarcodeType> &decoded_type, OutputArray points = noArray()) const;
+
+protected:
+    struct Impl;
+    Ptr<Impl> p;
+};
+//! @}
+}
+} // cv::barcode::
+#endif //__OPENCV_BARCODE_HPP__

modules/barcode/misc/java/filelist_common

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

modules/barcode/misc/java/gen_dict.json

@@ -0,0 +1,12 @@
+{
+  "type_dict": {
+    "vector_BarcodeType": {
+      "j_type": "List<Integer>",
+      "jn_type": "List<Integer>",
+      "jni_type": "jobject",
+      "jni_var": "std::vector< cv::barcode::BarcodeType > %(n)s",
+      "suffix": "Ljava_util_List",
+      "v_type": "vector_BarcodeType"
+    }
+  }
+}

modules/barcode/misc/java/src/cpp/barcode_converters.cpp

@@ -0,0 +1,28 @@
+// 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
+
+// Author: darkliang
+
+#include "barcode_converters.hpp"
+
+#define LOG_TAG "org.opencv.barcode"
+
+
+void Copy_vector_BarcodeType_to_List(JNIEnv* env, std::vector<cv::barcode::BarcodeType>& vs, jobject list)
+{
+    static jclass juArrayList = ARRAYLIST(env);
+    jmethodID m_add = LIST_ADD(env, juArrayList);
+    jmethodID m_clear = LIST_CLEAR(env, juArrayList);
+    env->CallVoidMethod(list, m_clear);
+
+    jclass jInteger = env->FindClass("java/lang/Integer");
+    jmethodID m_create_Integer = CONSTRUCTOR(env, jInteger);
+
+    for (size_t i = 0; i < vs.size(); ++i)
+    {
+        jobject element = env->NewObject(jInteger, m_create_Integer, vs[i]);
+        env->CallBooleanMethod(list, m_add, element);
+        env->DeleteLocalRef(element);
+    }
+}

modules/barcode/misc/java/src/cpp/barcode_converters.hpp

@@ -0,0 +1,20 @@
+// 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
+
+// Author: darkliang
+
+#ifndef BARCODE_CONVERTERS_HPP
+#define BARCODE_CONVERTERS_HPP
+
+#include <jni.h>
+#include "opencv_java.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/barcode.hpp"
+
+
+using namespace cv::barcode;
+
+void Copy_vector_BarcodeType_to_List(JNIEnv* env, std::vector<cv::barcode::BarcodeType>& vs, jobject list);
+
+#endif    /* BARCODE_CONVERTERS_HPP */

modules/barcode/misc/java/test/BarcodeDetectorTest.java

@@ -0,0 +1,51 @@
+package org.opencv.test.barcode;
+
+import java.util.List;
+import org.opencv.core.Mat;
+import org.opencv.barcode.BarcodeDetector;
+import org.opencv.imgcodecs.Imgcodecs;
+import org.opencv.test.OpenCVTestCase;
+import java.util.ArrayList;
+import static org.opencv.barcode.Barcode.EAN_13;
+
+public class BarcodeDetectorTest extends OpenCVTestCase {
+
+    private final static String ENV_OPENCV_TEST_DATA_PATH = "OPENCV_TEST_DATA_PATH";
+    private String testDataPath;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        testDataPath = System.getenv(ENV_OPENCV_TEST_DATA_PATH);
+        if (testDataPath == null)
+            throw new Exception(ENV_OPENCV_TEST_DATA_PATH + " has to be defined!");
+    }
+
+    public void testDetectAndDecode() {
+        Mat img = Imgcodecs.imread(testDataPath + "/cv/barcode/multiple/4_barcodes.jpg");
+        assertFalse(img.empty());
+        BarcodeDetector detector = new BarcodeDetector();
+        assertNotNull(detector);
+        List < String > infos = new ArrayList< String >();
+        List < Integer > types = new ArrayList< Integer >();
+
+        boolean result = detector.detectAndDecode(img, infos, types);
+        assertTrue(result);
+        assertEquals(infos.size(), 4);
+        assertEquals(types.size(), 4);
+        final String[]  correctResults = {"9787122276124", "9787118081473", "9787564350840", "9783319200064"};
+        for (int i = 0; i < 4; i++) {
+            assertEquals(types.get(i).intValue(), EAN_13);
+            result = false;
+            for (int j = 0; j < 4; j++) {
+                if (correctResults[j].equals(infos.get(i))) {
+                    result = true;
+                    break;
+                }
+            }
+            assertTrue(result);
+        }
+
+    }
+}

modules/barcode/misc/python/pyopencv_barcode.hpp

@@ -0,0 +1,22 @@
+#ifdef HAVE_OPENCV_BARCODE
+typedef std::vector<cv::barcode::BarcodeType> vector_BarcodeType;
+
+template<> struct pyopencvVecConverter<cv::barcode::BarcodeType>
+{
+    static bool to(PyObject* obj, std::vector<cv::barcode::BarcodeType>& value, const ArgInfo& info)
+    {
+        return pyopencv_to_generic_vec(obj, value, info);
+    }
+    static PyObject* from(const std::vector<cv::barcode::BarcodeType>& value)
+    {
+
+        return pyopencv_from_generic_vec(value);
+    }
+};
+
+template<>
+bool pyopencv_to(PyObject *o, std::vector<cv::barcode::BarcodeType>& types, const ArgInfo& info)
+{
+  return pyopencvVecConverter<cv::barcode::BarcodeType>::to(o, types, info);
+}
+#endif  // HAVE_OPENCV_BARCODE

modules/barcode/misc/python/test/test_barcode_detector.py

@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+'''
+===============================================================================
+Barcode detect and decode pipeline.
+===============================================================================
+'''
+import os
+import numpy as np
+import cv2 as cv
+
+from tests_common import NewOpenCVTests
+
+class barcode_detector_test(NewOpenCVTests):
+
+    def test_detect(self):
+        img = cv.imread(os.path.join(self.extraTestDataPath, 'cv/barcode/multiple/4_barcodes.jpg'))
+        self.assertFalse(img is None)
+        detector = cv.barcode_BarcodeDetector()
+        retval, corners = detector.detect(img)
+        self.assertTrue(retval)
+        self.assertEqual(corners.shape, (4, 4, 2))
+
+    def test_detect_and_decode(self):
+        img = cv.imread(os.path.join(self.extraTestDataPath, 'cv/barcode/single/book.jpg'))
+        self.assertFalse(img is None)
+        detector = cv.barcode_BarcodeDetector()
+        retval, decoded_info, decoded_type, corners = detector.detectAndDecode(img)
+        self.assertEqual(decoded_info[0], "9787115279460")
+        self.assertEqual(decoded_type[0], cv.barcode.EAN_13)
+        self.assertEqual(corners.shape, (1, 4, 2))