mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-26 07:07:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing warnings in tests

Browse Source
This commit is contained in:
Benjamin Knecht 2025-02-25 11:50:13 +01:00
parent 314f99f7a0
commit d869b12e89
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/objdetect/test/test_arucodetection.cpp
View File

@ -6,13 +6,15 @@
#include "opencv2/objdetect/aruco_detector.hpp" #include "opencv2/objdetect/aruco_detector.hpp"
#include "opencv2/calib3d.hpp" #include "opencv2/calib3d.hpp"
namespace cv::aruco { namespace cv {
bool operator==(const Dictionary& d1, const Dictionary& d2); namespace aruco {
bool operator==(const Dictionary& d1, const Dictionary& d2) { bool operator==(const Dictionary& d1, const Dictionary& d2);
return d1.markerSize == d2.markerSize bool operator==(const Dictionary& d1, const Dictionary& d2) {
&& std::equal(d1.bytesList.begin<uchar>(), d1.bytesList.end<uchar>(), d2.bytesList.begin<uchar>()) return d1.markerSize == d2.markerSize
&& d1.maxCorrectionBits == d2.maxCorrectionBits; && std::equal(d1.bytesList.begin<uchar>(), d1.bytesList.end<uchar>(), d2.bytesList.begin<uchar>())
}; && d1.maxCorrectionBits == d2.maxCorrectionBits;
};
}
} }
namespace opencv_test { namespace { namespace opencv_test { namespace {
@ -730,9 +732,19 @@ TEST(CV_ArucoMultiDict, serialization)
aruco::ArucoDetector detector; aruco::ArucoDetector detector;
{ {
FileStorage fs(fileName, FileStorage::Mode::WRITE); FileStorage fs(fileName, FileStorage::Mode::WRITE);
if (!fs.isOpened()) {
cout << "[ SKIPPED ] " << "CV_ArucoMultiDict.serialization"
<< " - Skipping due to 'File system write error.'" << endl;
return;
}
detector.write(fs); detector.write(fs);
fs.release(); fs.release();
FileStorage test_fs(fileName, FileStorage::Mode::READ); FileStorage test_fs(fileName, FileStorage::Mode::READ);
if (!test_fs.isOpened()) {
cout << "[ SKIPPED ] " << "CV_ArucoMultiDict.serialization"
<< " - Skipping due to 'File system read error.'" << endl;
return;
}
aruco::ArucoDetector test_detector; aruco::ArucoDetector test_detector;
test_detector.read(test_fs.root()); test_detector.read(test_fs.root());
// compare default constructor result // compare default constructor result
@ -741,9 +753,19 @@ TEST(CV_ArucoMultiDict, serialization)
detector.setDictionaries({aruco::getPredefinedDictionary(aruco::DICT_4X4_50), aruco::getPredefinedDictionary(aruco::DICT_5X5_100)}); detector.setDictionaries({aruco::getPredefinedDictionary(aruco::DICT_4X4_50), aruco::getPredefinedDictionary(aruco::DICT_5X5_100)});
{ {
FileStorage fs(fileName, FileStorage::Mode::WRITE); FileStorage fs(fileName, FileStorage::Mode::WRITE);
if (!fs.isOpened()) {
cout << "[ SKIPPED ] " << "CV_ArucoMultiDict.serialization"
<< " - Skipping due to 'File system write error.'" << endl;
return;
}
detector.write(fs); detector.write(fs);
fs.release(); fs.release();
FileStorage test_fs(fileName, FileStorage::Mode::READ); FileStorage test_fs(fileName, FileStorage::Mode::READ);
if (!test_fs.isOpened()) {
cout << "[ SKIPPED ] " << "CV_ArucoMultiDict.serialization"
<< " - Skipping due to 'File system read error.'" << endl;
return;
}
aruco::ArucoDetector test_detector; aruco::ArucoDetector test_detector;
test_detector.read(test_fs.root()); test_detector.read(test_fs.root());
// check for one additional dictionary // check for one additional dictionary