mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 19:20:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #23892 from vrabaud:compile_fix

Browse Source 
Fix compilation when HAVE_QUIRC is not set.
This commit is contained in:
Alexander Smorkalov 2023-07-03 13:16:49 +03:00 committed by GitHub
commit 377be68d92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/objdetect/test/test_qr_utils.hpp
View File

@ -10,6 +10,9 @@ void check_qr(const string& root, const string& name_current_image, const string
const std::vector<Point>& corners, const std::vector<Point>& corners,
const std::vector<string>& decoded_info, const int max_pixel_error, const std::vector<string>& decoded_info, const int max_pixel_error,
bool isMulti = false) { bool isMulti = false) {
#ifndef HAVE_QUIRC
CV_UNUSED(decoded_info);
#endif
const std::string dataset_config = findDataFile(root + "dataset_config.json"); const std::string dataset_config = findDataFile(root + "dataset_config.json");
FileStorage file_config(dataset_config, FileStorage::READ); FileStorage file_config(dataset_config, FileStorage::READ);
ASSERT_TRUE(file_config.isOpened()) << "Can't read validation data: " << dataset_config; ASSERT_TRUE(file_config.isOpened()) << "Can't read validation data: " << dataset_config;

4
modules/objdetect/test/test_qrcode.cpp
View File

@ -374,8 +374,8 @@ TEST_P(Objdetect_QRCode_Multi, regression)
qrcode = QRCodeDetectorAruco(); qrcode = QRCodeDetectorAruco();
} }
std::vector<Point> corners; std::vector<Point> corners;
#ifdef HAVE_QUIRC
std::vector<cv::String> decoded_info; std::vector<cv::String> decoded_info;
#ifdef HAVE_QUIRC
std::vector<Mat> straight_barcode; std::vector<Mat> straight_barcode;
EXPECT_TRUE(qrcode.detectAndDecodeMulti(src, decoded_info, corners, straight_barcode)); EXPECT_TRUE(qrcode.detectAndDecodeMulti(src, decoded_info, corners, straight_barcode));
ASSERT_FALSE(corners.empty()); ASSERT_FALSE(corners.empty());
@ -538,7 +538,6 @@ TEST(Objdetect_QRCode_detect_flipped, regression_23249)
for(const auto &flipped_image : flipped_images){ for(const auto &flipped_image : flipped_images){
const std::string &image_name = flipped_image.first; const std::string &image_name = flipped_image.first;
const std::string &expect_msg = flipped_image.second;
std::string image_path = findDataFile(root + image_name); std::string image_path = findDataFile(root + image_name);
Mat src = imread(image_path); Mat src = imread(image_path);
@ -551,6 +550,7 @@ TEST(Objdetect_QRCode_detect_flipped, regression_23249)
EXPECT_TRUE(!corners.empty()); EXPECT_TRUE(!corners.empty());
std::string decoded_msg; std::string decoded_msg;
#ifdef HAVE_QUIRC #ifdef HAVE_QUIRC
const std::string &expect_msg = flipped_image.second;
EXPECT_NO_THROW(decoded_msg = qrcode.decode(src, corners, straight_barcode)); EXPECT_NO_THROW(decoded_msg = qrcode.decode(src, corners, straight_barcode));
ASSERT_FALSE(straight_barcode.empty()) << "Can't decode qrimage."; ASSERT_FALSE(straight_barcode.empty()) << "Can't decode qrimage.";
EXPECT_EQ(expect_msg, decoded_msg); EXPECT_EQ(expect_msg, decoded_msg);