mirror of
https://github.com/opencv/opencv.git
synced 2026-07-30 15:53:03 +04:00
Merge pull request #25026 from akretz:fix_qrcode_bugs
Fix qrcode bugs #25026 This PR fixes #22892, #24011 and #24450 and adds regression tests using the images provided. I've also verified with the [benchmark](https://github.com/opencv/opencv_benchmarks/tree/develop/python_benchmarks/qr_codes) that this doesn't break anything there. resolves #22892 resolves #24011 resolves #24450 Replaces #23802 Requires extra: https://github.com/opencv/opencv_extra/pull/1148 ### 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
This commit is contained in:
@@ -631,4 +631,52 @@ TEST_P(Objdetect_QRCode_detectAndDecodeMulti, detect_regression_24679)
|
||||
EXPECT_EQ(decoded_info.size(), 4U);
|
||||
}
|
||||
|
||||
TEST_P(Objdetect_QRCode_detectAndDecodeMulti, detect_regression_24011)
|
||||
{
|
||||
const std::string name_current_image = "issue_24011.jpg";
|
||||
const std::string root = "qrcode/";
|
||||
|
||||
std::string image_path = findDataFile(root + name_current_image);
|
||||
Mat img = imread(image_path);
|
||||
const std::string method = GetParam();
|
||||
GraphicalCodeDetector qrcode = QRCodeDetector();
|
||||
if (method == "aruco_based") {
|
||||
qrcode = QRCodeDetectorAruco();
|
||||
}
|
||||
std::vector<cv::String> decoded_info;
|
||||
ASSERT_TRUE(qrcode.detectAndDecodeMulti(img, decoded_info));
|
||||
EXPECT_EQ(decoded_info.size(), 2U);
|
||||
}
|
||||
|
||||
TEST(Objdetect_QRCode_detect, detect_regression_24450)
|
||||
{
|
||||
const std::string name_current_image = "issue_24450.png";
|
||||
const std::string root = "qrcode/";
|
||||
|
||||
std::string image_path = findDataFile(root + name_current_image);
|
||||
Mat img = imread(image_path);
|
||||
GraphicalCodeDetector qrcode = QRCodeDetector();
|
||||
std::vector<Point2f> points;
|
||||
ASSERT_TRUE(qrcode.detect(img, points));
|
||||
EXPECT_EQ(points.size(), 4U);
|
||||
img.at<Vec3b>(img.rows - 1, 296) = {};
|
||||
ASSERT_TRUE(qrcode.detect(img, points));
|
||||
EXPECT_EQ(points.size(), 4U);
|
||||
}
|
||||
|
||||
TEST(Objdetect_QRCode_detect, detect_regression_22892)
|
||||
{
|
||||
const std::string name_current_image = "issue_22892.png";
|
||||
const std::string root = "qrcode/";
|
||||
|
||||
std::string image_path = findDataFile(root + name_current_image);
|
||||
Mat img = imread(image_path);
|
||||
|
||||
QRCodeDetector qrcode;
|
||||
std::vector<Point> corners;
|
||||
Mat straight_code;
|
||||
qrcode.detectAndDecodeCurved(img, corners, straight_code);
|
||||
EXPECT_EQ(corners.size(), 4U);
|
||||
}
|
||||
|
||||
}} // namespace
|
||||
|
||||
Reference in New Issue
Block a user