Merge pull request #25035 from AleksandrPanov:fix_Barcode_detectAndDecode

Alexander Panov · web-flow · commit b2db95961938 · 2024-02-16T16:37:49.000+03:00
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
diff --git 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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ PERF_TEST_P_(Perf_Barcode_multi, detect)`
`30`	`30`	`}`
`31`	`31`	`SANITY_CHECK_NOTHING();`
`32`	`32`	`ASSERT_TRUE(res);`
	`33`	`+ ASSERT_EQ(16ull, corners.size());`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`PERF_TEST_P_(Perf_Barcode_multi, detect_decode)`
`@@ -54,6 +55,8 @@ PERF_TEST_P_(Perf_Barcode_multi, detect_decode)`
`54`	`55`	`}`
`55`	`56`	`SANITY_CHECK_NOTHING();`
`56`	`57`	`ASSERT_TRUE(res);`
	`58`	`+ ASSERT_EQ(16ull, corners.size());`
	`59`	`+ ASSERT_EQ(4ull, decoded_info.size());`
`57`	`60`	`}`
`58`	`61`
`59`	`62`	`PERF_TEST_P_(Perf_Barcode_single, detect)`
`@@ -76,6 +79,7 @@ PERF_TEST_P_(Perf_Barcode_single, detect)`
`76`	`79`	`}`
`77`	`80`	`SANITY_CHECK_NOTHING();`
`78`	`81`	`ASSERT_TRUE(res);`
	`82`	`+ ASSERT_EQ(4ull, corners.size());`
`79`	`83`	`}`
`80`	`84`
`81`	`85`	`PERF_TEST_P_(Perf_Barcode_single, detect_decode)`
`@@ -100,6 +104,8 @@ PERF_TEST_P_(Perf_Barcode_single, detect_decode)`
`100`	`104`	`}`
`101`	`105`	`SANITY_CHECK_NOTHING();`
`102`	`106`	`ASSERT_TRUE(res);`
	`107`	`+ ASSERT_EQ(4ull, corners.size());`
	`108`	`+ ASSERT_EQ(1ull, decoded_info.size());`
`103`	`109`	`}`
`104`	`110`
`105`	`111`	`INSTANTIATE_TEST_CASE_P(/nothing/, Perf_Barcode_multi,`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,13 @@ TEST_P(BarcodeDetector_main, interface)`
`95`	`95`	`EXPECT_EQ(1u, expected_lines.count(res));`
`96`	`96`	`}`
`97`	`97`
	`98`	`+ {`
	`99`	`+ string res = det.detectAndDecode(img, points);`
	`100`	`+ ASSERT_FALSE(res.empty());`
	`101`	`+ EXPECT_EQ(1u, expected_lines.count(res));`
	`102`	`+ EXPECT_EQ(4u, points.size());`
	`103`	`+ }`
	`104`	`+`
`98`	`105`	`// common interface (multi)`
`99`	`106`	`{`
`100`	`107`	`bool res = det.detectMulti(img, points);`