Skip to content

Commit 1431778

Browse files
author
AleksandrPanov
committed
fixed bug and cast warnings
1 parent de41bb9 commit 1431778

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

modules/aruco/src/aruco_detector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ bool DetectorParameters::readDetectorParameters(const FileNode& fn) {
6363

6464
bool DetectorParameters::writeDetectorParameters(const Ptr<FileStorage>& fs)
6565
{
66-
if (fs.empty() && !fs->isOpened())
66+
if (fs.empty() || !fs->isOpened())
6767
return false;
6868
return readWrite(*this, nullptr, fs);
6969
}

modules/aruco/src/charuco.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ void detectCharucoDiamond(InputArray _image, InputArrayOfArrays _markerCorners,
428428
// try to find the rest of markers in the diamond
429429
vector< int > acceptedIdxs;
430430
Ptr<Board> _b = _charucoDiamondLayout.staticCast<Board>();
431-
Ptr<RefineParameters> refineParameters = makePtr<RefineParameters>(minRepDistance, -1, false);
431+
Ptr<RefineParameters> refineParameters = makePtr<RefineParameters>(minRepDistance, -1.f, false);
432432
ArucoDetector detector(dictionary, DetectorParameters::create(), refineParameters);
433433
detector.refineDetectedMarkers(grey, _b, currentMarker, currentMarkerId, candidates, noArray(), noArray(),
434434
acceptedIdxs);

modules/aruco/test/test_boarddetection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ class CV_ArucoRefine : public cvtest::BaseTest {
170170
params->cornerRefinementMethod = aruco::CORNER_REFINE_SUBPIX;
171171
if (arucoAlgParams == ArucoAlgParams::USE_ARUCO3)
172172
params->useAruco3Detection = true;
173-
Ptr<aruco::RefineParameters> refineParams = makePtr<aruco::RefineParameters>(10, 3., true);
173+
Ptr<aruco::RefineParameters> refineParams = makePtr<aruco::RefineParameters>(10.f, 3.f, true);
174174
detector = aruco::ArucoDetector(dictionary, params, refineParams);
175175
}
176176

0 commit comments

Comments
 (0)