From b2db9596193857156dbf8406fac77e5a54aa17cf Mon Sep 17 00:00:00 2001
From: Alexander Panov <alexander.panov@xperience.ai>
Date: Fri, 16 Feb 2024 16:37:49 +0300
Subject: [PATCH] Merge pull request #25035 from
 AleksandrPanov:fix_Barcode_detectAndDecode

Fix barcode detectAndDecode #25035

The method `detectAndDecode()` in the `BarcodeDetector` class doesn't return the barcode corners.
This PR fixes the and add test for `detectAndDecode`.

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
---
 modules/objdetect/perf/perf_barcode.cpp | 6 ++++++
 modules/objdetect/src/barcode.cpp       | 4 ++--
 modules/objdetect/test/test_barcode.cpp | 7 +++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/modules/objdetect/perf/perf_barcode.cpp b/modules/objdetect/perf/perf_barcode.cpp
index b960518a1e..9c464bbd11 100644
--- a/modules/objdetect/perf/perf_barcode.cpp
+++ b/modules/objdetect/perf/perf_barcode.cpp
@@ -30,6 +30,7 @@ PERF_TEST_P_(Perf_Barcode_multi, detect)
     }
     SANITY_CHECK_NOTHING();
     ASSERT_TRUE(res);
+    ASSERT_EQ(16ull, corners.size());
 }
 
 PERF_TEST_P_(Perf_Barcode_multi, detect_decode)
@@ -54,6 +55,8 @@ PERF_TEST_P_(Perf_Barcode_multi, detect_decode)
     }
     SANITY_CHECK_NOTHING();
     ASSERT_TRUE(res);
+    ASSERT_EQ(16ull, corners.size());
+    ASSERT_EQ(4ull, decoded_info.size());
 }
 
 PERF_TEST_P_(Perf_Barcode_single, detect)
@@ -76,6 +79,7 @@ PERF_TEST_P_(Perf_Barcode_single, detect)
     }
     SANITY_CHECK_NOTHING();
     ASSERT_TRUE(res);
+    ASSERT_EQ(4ull, corners.size());
 }
 
 PERF_TEST_P_(Perf_Barcode_single, detect_decode)
@@ -100,6 +104,8 @@ PERF_TEST_P_(Perf_Barcode_single, detect_decode)
     }
     SANITY_CHECK_NOTHING();
     ASSERT_TRUE(res);
+    ASSERT_EQ(4ull, corners.size());
+    ASSERT_EQ(1ull, decoded_info.size());
 }
 
 INSTANTIATE_TEST_CASE_P(/*nothing*/, Perf_Barcode_multi,
diff --git a/modules/objdetect/src/barcode.cpp b/modules/objdetect/src/barcode.cpp
index e0c7d9cb57..172fb5bd77 100644
--- a/modules/objdetect/src/barcode.cpp
+++ b/modules/objdetect/src/barcode.cpp
@@ -302,13 +302,13 @@ string BarcodeImpl::detectAndDecode(InputArray img, OutputArray points, OutputAr
     CV_UNUSED(straight_code);
     vector<string> decoded_info;
     vector<string> decoded_type;
-    vector<Point> points_;
+    vector<Point2f> points_;
     if (!detectAndDecodeWithType(img, decoded_info, decoded_type, points_))
         return string();
     if (points_.size() < 4 || decoded_info.size() < 1)
         return string();
     points_.resize(4);
-    points.setTo(points_);
+    updatePointsResult(points, points_);
     return decoded_info[0];
 }
 
diff --git a/modules/objdetect/test/test_barcode.cpp b/modules/objdetect/test/test_barcode.cpp
index d8e2002f23..7e295fafa3 100644
--- a/modules/objdetect/test/test_barcode.cpp
+++ b/modules/objdetect/test/test_barcode.cpp
@@ -95,6 +95,13 @@ TEST_P(BarcodeDetector_main, interface)
         EXPECT_EQ(1u, expected_lines.count(res));
     }
 
+    {
+        string res = det.detectAndDecode(img, points);
+        ASSERT_FALSE(res.empty());
+        EXPECT_EQ(1u, expected_lines.count(res));
+        EXPECT_EQ(4u, points.size());
+    }
+
     // common interface (multi)
     {
         bool res = det.detectMulti(img, points);