opencv
diff --git a/‎CMakeLists.txt
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎CMakeLists.txt
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎modules/objdetect/perf/perf_qrcode_pipeline.cpp
Copy file name to clipboard
-6Lines changed: 0 additions & 6 deletions b/‎modules/objdetect/perf/perf_qrcode_pipeline.cpp
Copy file name to clipboard
-6Lines changed: 0 additions & 6 deletions
diff --git a/‎modules/objdetect/src/graphical_code_detector_impl.hpp
Copy file name to clipboard
+13-1Lines changed: 13 additions & 1 deletion b/‎modules/objdetect/src/graphical_code_detector_impl.hpp
Copy file name to clipboard
+13-1Lines changed: 13 additions & 1 deletion
diff --git a/‎modules/objdetect/src/qrcode.cpp
Copy file name to clipboard
+45-37Lines changed: 45 additions & 37 deletions b/‎modules/objdetect/src/qrcode.cpp
Copy file name to clipboard
+45-37Lines changed: 45 additions & 37 deletions
@@ -456,7 +456,7 @@ OCV_OPTION(WITH_IMGCODEC_PXM "Include PNM (PBM,PGM,PPM) and PAM formats support"
 OCV_OPTION(WITH_IMGCODEC_PFM "Include PFM formats support" ON
   VISIBLE_IF TRUE
   VERIFY HAVE_IMGCODEC_PFM)
-OCV_OPTION(WITH_QUIRC "Include library QR-code decoding" ON
+OCV_OPTION(WITH_QUIRC "Include library QR-code decoding" OFF
   VISIBLE_IF TRUE
   VERIFY HAVE_QUIRC)
 OCV_OPTION(WITH_ANDROID_MEDIANDK "Use Android Media NDK for Video I/O (Android)" (ANDROID_NATIVE_API_LEVEL GREATER 20)
 
@@ -29,7 +29,6 @@ PERF_TEST_P_(Perf_Objdetect_QRCode, detect)
     SANITY_CHECK_NOTHING();
 }
 
-#ifdef HAVE_QUIRC
 PERF_TEST_P_(Perf_Objdetect_QRCode, decode)
 {
     const std::string name_current_image = GetParam();
@@ -52,7 +51,6 @@ PERF_TEST_P_(Perf_Objdetect_QRCode, decode)
     check_qr(root, name_current_image, "test_images", corners, {decoded_info}, pixels_error);
     SANITY_CHECK_NOTHING();
 }
-#endif
 
 typedef ::perf::TestBaseWithParam<std::tuple<std::string, std::string>> Perf_Objdetect_QRCode_Multi;
 
@@ -78,7 +76,6 @@ PERF_TEST_P_(Perf_Objdetect_QRCode_Multi, detectMulti)
     SANITY_CHECK_NOTHING();
 }
 
-#ifdef HAVE_QUIRC
 PERF_TEST_P_(Perf_Objdetect_QRCode_Multi, decodeMulti)
 {
     const std::string name_current_image = get<0>(GetParam());
@@ -116,7 +113,6 @@ PERF_TEST_P_(Perf_Objdetect_QRCode_Multi, decodeMulti)
     check_qr(root, name_current_image, "multiple_images", corners_result, decoded_info, pixels_error, true);
     SANITY_CHECK_NOTHING();
 }
-#endif
 
 INSTANTIATE_TEST_CASE_P(/*nothing*/, Perf_Objdetect_QRCode,
     ::testing::Values(
@@ -163,7 +159,6 @@ PERF_TEST_P_(Perf_Objdetect_Not_QRCode, detect)
     SANITY_CHECK_NOTHING();
 }
 
-#ifdef HAVE_QUIRC
 PERF_TEST_P_(Perf_Objdetect_Not_QRCode, decode)
 {
     Mat straight_barcode;
@@ -195,7 +190,6 @@ PERF_TEST_P_(Perf_Objdetect_Not_QRCode, decode)
     TEST_CYCLE() ASSERT_TRUE(qrcode.decode(not_qr_code, corners, straight_barcode).empty());
     SANITY_CHECK_NOTHING();
 }
-#endif
 
 INSTANTIATE_TEST_CASE_P(/*nothing*/, Perf_Objdetect_Not_QRCode,
       ::testing::Combine(
 
@@ -20,6 +20,18 @@ struct GraphicalCodeDetector::Impl {
                                       OutputArray points, OutputArrayOfArrays straight_code) const = 0;
 };
 
+class QRCodeDecoder {
+public:
+    virtual ~QRCodeDecoder();
+
+    static Ptr<QRCodeDecoder> create();
+
+    virtual bool decode(const Mat& straight, String& decoded_info) = 0;
+
+    QRCodeEncoder::EncodeMode mode;
+    QRCodeEncoder::ECIEncodings eci;
+};
+
 }
 
-#endif
+#endif
@@ -2727,7 +2727,6 @@ bool QRDecode::samplingForVersion()
     return true;
 }
 
-
 static bool checkASCIIcompatible(const uint8_t* str, const size_t size) {
     for (size_t i = 0; i < size; ++i) {
         uint8_t byte = str[i];
@@ -2781,6 +2780,10 @@ static std::string encodeUTF8_bytesarray(const uint8_t* str, const size_t size)
 
 bool QRDecode::decodingProcess()
 {
+    QRCodeEncoder::EncodeMode mode;
+    QRCodeEncoder::ECIEncodings eci;
+    const uint8_t* payload;
+    size_t payload_len;
 #ifdef HAVE_QUIRC
     if (straight.empty()) { return false; }
 
@@ -2810,90 +2813,95 @@ bool QRDecode::decodingProcess()
 
     CV_LOG_INFO(NULL, "QR: decoded with .version=" << qr_code_data.version << " .data_type=" << qr_code_data.data_type << " .eci=" << qr_code_data.eci << " .payload_len=" << qr_code_data.payload_len)
 
-    switch (qr_code_data.data_type)
+    mode = static_cast<QRCodeEncoder::EncodeMode>(qr_code_data.data_type);
+    eci = static_cast<QRCodeEncoder::ECIEncodings>(qr_code_data.eci);
+    payload = qr_code_data.payload;
+    payload_len = qr_code_data.payload_len;
+#else
+    auto decoder = QRCodeDecoder::create();
+    if (!decoder->decode(straight, result_info))
+        return false;
+    mode = decoder->mode;
+    eci = decoder->eci;
+    payload = reinterpret_cast<const uint8_t*>(result_info.c_str());
+    payload_len = result_info.size();
+#endif
+
+    // Check output string format
+    switch (mode)
     {
-        case QUIRC_DATA_TYPE_NUMERIC:
-            if (!checkASCIIcompatible(qr_code_data.payload, qr_code_data.payload_len)) {
+        case QRCodeEncoder::EncodeMode::MODE_NUMERIC:
+            if (!checkASCIIcompatible(payload, payload_len)) {
                 CV_LOG_INFO(NULL, "QR: DATA_TYPE_NUMERIC payload must be ACSII compatible string");
                 return false;
             }
-            result_info.assign((const char*)qr_code_data.payload, qr_code_data.payload_len);
+            result_info.assign((const char*)payload, payload_len);
             return true;
-        case QUIRC_DATA_TYPE_ALPHA:
-            if (!checkASCIIcompatible(qr_code_data.payload, qr_code_data.payload_len)) {
+        case QRCodeEncoder::EncodeMode::MODE_ALPHANUMERIC:
+            if (!checkASCIIcompatible(payload, payload_len)) {
                 CV_LOG_INFO(NULL, "QR: DATA_TYPE_ALPHA payload must be ASCII compatible string");
                 return false;
             }
-            result_info.assign((const char*)qr_code_data.payload, qr_code_data.payload_len);
+            result_info.assign((const char*)payload, payload_len);
             return true;
-        case QUIRC_DATA_TYPE_BYTE:
+        case QRCodeEncoder::EncodeMode::MODE_BYTE:
             // https://en.wikipedia.org/wiki/Extended_Channel_Interpretation
-            if (qr_code_data.eci == QUIRC_ECI_UTF_8) {
+            if (eci == QRCodeEncoder::ECIEncodings::ECI_UTF8) {
                 CV_LOG_INFO(NULL, "QR: payload ECI is UTF-8");
-                if (!checkUTF8(qr_code_data.payload, qr_code_data.payload_len)) {
+                if (!checkUTF8(payload, payload_len)) {
                     CV_LOG_INFO(NULL, "QUIRC_DATA_TYPE_BYTE with UTF-8 ECI must be UTF-8 compatible string");
                     return false;
                 }
-                result_info.assign((const char*)qr_code_data.payload, qr_code_data.payload_len);
-            } else if (qr_code_data.eci == 25/*ECI_UTF_16BE*/) {
+                result_info.assign((const char*)payload, payload_len);
+            } else if (eci == 25/*ECI_UTF_16BE*/) {
                 CV_LOG_INFO(NULL, "QR: UTF-16BE ECI is not supported");
                 return false;
-            } else if (checkASCIIcompatible(qr_code_data.payload, qr_code_data.payload_len)) {
+            } else if (checkASCIIcompatible(payload, payload_len)) {
                 CV_LOG_INFO(NULL, "QR: payload is ASCII compatible (special handling for symbols encoding is not needed)");
-                result_info.assign((const char*)qr_code_data.payload, qr_code_data.payload_len);
+                result_info.assign((const char*)payload, payload_len);
             } else {
-                if (checkUTF8(qr_code_data.payload, qr_code_data.payload_len)) {
+                if (checkUTF8(payload, payload_len)) {
                     CV_LOG_INFO(NULL, "QR: payload QUIRC_DATA_TYPE_BYTE is UTF-8 compatible, return as-is");
-                    result_info.assign((const char*)qr_code_data.payload, qr_code_data.payload_len);
+                    result_info.assign((const char*)payload, payload_len);
                 } else {
                     CV_LOG_INFO(NULL, "QR: assume 1-byte per symbol encoding");
-                    result_info = encodeUTF8_bytesarray(qr_code_data.payload, qr_code_data.payload_len);
+                    result_info = encodeUTF8_bytesarray(payload, payload_len);
                 }
             }
             return true;
-        case QUIRC_DATA_TYPE_KANJI:
+        case QRCodeEncoder::EncodeMode::MODE_KANJI:
             // FIXIT BUG: we must return UTF-8 compatible string
             CV_LOG_WARNING(NULL, "QR: Kanji is not supported properly");
-            result_info.assign((const char*)qr_code_data.payload, qr_code_data.payload_len);
+            result_info.assign((const char*)payload, payload_len);
+            return true;
+        case QRCodeEncoder::EncodeMode::MODE_ECI:
+            CV_LOG_WARNING(NULL, "QR: ECI is not supported properly");
+            result_info.assign((const char*)payload, payload_len);
             return true;
+        default:
+            CV_LOG_WARNING(NULL, "QR: unsupported QR data type");
+            return false;
     }
-
-    CV_LOG_WARNING(NULL, "QR: unsupported QR data type");
-    return false;
-#else
-    return false;
-#endif
-
 }
 
 bool QRDecode::straightDecodingProcess()
 {
-#ifdef HAVE_QUIRC
     if (!updatePerspective(getHomography()))  { return false; }
     if (!versionDefinition())  { return false; }
     if (useAlignmentMarkers)
         detectAlignment();
     if (!samplingForVersion()) { return false; }
     if (!decodingProcess())    { return false; }
     return true;
-#else
-    std::cout << "Library QUIRC is not linked. No decoding is performed. Take it to the OpenCV repository." << std::endl;
-    return false;
-#endif
 }
 
 bool QRDecode::curvedDecodingProcess()
 {
-#ifdef HAVE_QUIRC
     if (!preparingCurvedQRCodes()) { return false; }
     if (!versionDefinition())  { return false; }
     if (!samplingForVersion()) { return false; }
     if (!decodingProcess())    { return false; }
     return true;
-#else
-    std::cout << "Library QUIRC is not linked. No decoding is performed. Take it to the OpenCV repository." << std::endl;
-    return false;
-#endif
 }
 
 QRDecode::QRDecode(bool _useAlignmentMarkers):
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ PERF_TEST_P_(Perf_Objdetect_QRCode, detect)`
`29`	`29`	`SANITY_CHECK_NOTHING();`
`30`	`30`	`}`
`31`	`31`
`32`		`-#ifdef HAVE_QUIRC`
`33`	`32`	`PERF_TEST_P_(Perf_Objdetect_QRCode, decode)`
`34`	`33`	`{`
`35`	`34`	`const std::string name_current_image = GetParam();`
`@@ -52,7 +51,6 @@ PERF_TEST_P_(Perf_Objdetect_QRCode, decode)`
`52`	`51`	`check_qr(root, name_current_image, "test_images", corners, {decoded_info}, pixels_error);`
`53`	`52`	`SANITY_CHECK_NOTHING();`
`54`	`53`	`}`
`55`		`-#endif`
`56`	`54`
`57`	`55`	`typedef ::perf::TestBaseWithParam<std::tuple<std::string, std::string>> Perf_Objdetect_QRCode_Multi;`
`58`	`56`
`@@ -78,7 +76,6 @@ PERF_TEST_P_(Perf_Objdetect_QRCode_Multi, detectMulti)`
`78`	`76`	`SANITY_CHECK_NOTHING();`
`79`	`77`	`}`
`80`	`78`
`81`		`-#ifdef HAVE_QUIRC`
`82`	`79`	`PERF_TEST_P_(Perf_Objdetect_QRCode_Multi, decodeMulti)`
`83`	`80`	`{`
`84`	`81`	`const std::string name_current_image = get<0>(GetParam());`
`@@ -116,7 +113,6 @@ PERF_TEST_P_(Perf_Objdetect_QRCode_Multi, decodeMulti)`
`116`	`113`	`check_qr(root, name_current_image, "multiple_images", corners_result, decoded_info, pixels_error, true);`
`117`	`114`	`SANITY_CHECK_NOTHING();`
`118`	`115`	`}`
`119`		`-#endif`
`120`	`116`
`121`	`117`	`INSTANTIATE_TEST_CASE_P(/nothing/, Perf_Objdetect_QRCode,`
`122`	`118`	`::testing::Values(`
`@@ -163,7 +159,6 @@ PERF_TEST_P_(Perf_Objdetect_Not_QRCode, detect)`
`163`	`159`	`SANITY_CHECK_NOTHING();`
`164`	`160`	`}`
`165`	`161`
`166`		`-#ifdef HAVE_QUIRC`
`167`	`162`	`PERF_TEST_P_(Perf_Objdetect_Not_QRCode, decode)`
`168`	`163`	`{`
`169`	`164`	`Mat straight_barcode;`
`@@ -195,7 +190,6 @@ PERF_TEST_P_(Perf_Objdetect_Not_QRCode, decode)`
`195`	`190`	`TEST_CYCLE() ASSERT_TRUE(qrcode.decode(not_qr_code, corners, straight_barcode).empty());`
`196`	`191`	`SANITY_CHECK_NOTHING();`
`197`	`192`	`}`
`198`		`-#endif`
`199`	`193`
`200`	`194`	`INSTANTIATE_TEST_CASE_P(/nothing/, Perf_Objdetect_Not_QRCode,`
`201`	`195`	`::testing::Combine(`