From 3559e761a38d7759516ab33742cb69f83f5eb11c Mon Sep 17 00:00:00 2001
From: AleksandrPanov <alexander.panov@xperience.ai>
Date: Mon, 5 Sep 2022 17:32:23 +0300
Subject: [PATCH] fixed bug and cast warnings

---
 modules/aruco/src/aruco_detector.cpp       | 2 +-
 modules/aruco/src/charuco.cpp              | 2 +-
 modules/aruco/test/test_boarddetection.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/aruco/src/aruco_detector.cpp b/modules/aruco/src/aruco_detector.cpp
index 45f7cc101b8..684e403fd4a 100644
--- a/modules/aruco/src/aruco_detector.cpp
+++ b/modules/aruco/src/aruco_detector.cpp
@@ -63,7 +63,7 @@ bool DetectorParameters::readDetectorParameters(const FileNode& fn) {
 
 bool DetectorParameters::writeDetectorParameters(const Ptr<FileStorage>& fs)
 {
-    if (fs.empty() && !fs->isOpened())
+    if (fs.empty() || !fs->isOpened())
         return false;
     return readWrite(*this, nullptr, fs);
 }
diff --git a/modules/aruco/src/charuco.cpp b/modules/aruco/src/charuco.cpp
index a61e0e70567..ba10a7eae46 100644
--- a/modules/aruco/src/charuco.cpp
+++ b/modules/aruco/src/charuco.cpp
@@ -428,7 +428,7 @@ void detectCharucoDiamond(InputArray _image, InputArrayOfArrays _markerCorners,
         // try to find the rest of markers in the diamond
         vector< int > acceptedIdxs;
         Ptr<Board> _b = _charucoDiamondLayout.staticCast<Board>();
-        Ptr<RefineParameters> refineParameters = makePtr<RefineParameters>(minRepDistance, -1, false);
+        Ptr<RefineParameters> refineParameters = makePtr<RefineParameters>(minRepDistance, -1.f, false);
         ArucoDetector detector(dictionary, DetectorParameters::create(), refineParameters);
         detector.refineDetectedMarkers(grey, _b, currentMarker, currentMarkerId, candidates, noArray(), noArray(),
                                        acceptedIdxs);
diff --git a/modules/aruco/test/test_boarddetection.cpp b/modules/aruco/test/test_boarddetection.cpp
index 148c6d440d0..5a65c225a7f 100644
--- a/modules/aruco/test/test_boarddetection.cpp
+++ b/modules/aruco/test/test_boarddetection.cpp
@@ -170,7 +170,7 @@ class CV_ArucoRefine : public cvtest::BaseTest {
         params->cornerRefinementMethod = aruco::CORNER_REFINE_SUBPIX;
         if (arucoAlgParams == ArucoAlgParams::USE_ARUCO3)
             params->useAruco3Detection = true;
-        Ptr<aruco::RefineParameters> refineParams = makePtr<aruco::RefineParameters>(10, 3., true);
+        Ptr<aruco::RefineParameters> refineParams = makePtr<aruco::RefineParameters>(10.f, 3.f, true);
         detector = aruco::ArucoDetector(dictionary, params, refineParams);
     }