remove readWrite() from API

opencv · Jul 4, 2022 · 4b321ac · 4b321ac
1 parent 059ade9
commit 4b321ac
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/modules/aruco/include/opencv2/aruco/board.hpp b/modules/aruco/include/opencv2/aruco/board.hpp
@@ -211,7 +211,10 @@ class CV_EXPORTS_W CharucoBoard : public Board {
  * @return bool value, 1 (true) if detected corners form a line, 0 (false) if they do not.
       solvePnP, calibration functions will fail if the corners are collinear (true).
  *
- * The number of ids in charucoIDs should be <= the number of chessboard corners in the board.  This functions checks whether the charuco corners are on a straight line (returns true, if so), or not (false).  Axis parallel, as well as diagonal and other straight lines detected.  Degenerate cases: for number of charucoIDs <= 2, the function returns true.
+ * The number of ids in charucoIDs should be <= the number of chessboard corners in the board.
+ * This functions checks whether the charuco corners are on a straight line (returns true, if so), or not (false).
+ * Axis parallel, as well as diagonal and other straight lines detected.  Degenerate cases:
+ * for number of charucoIDs <= 2,the function returns true.
  */
 CV_EXPORTS_W bool testCharucoCornersCollinear(const Ptr<CharucoBoard> &board, InputArray charucoIds);
 

diff --git a/modules/aruco/include/opencv2/aruco_detector.hpp b/modules/aruco/include/opencv2/aruco_detector.hpp
@@ -280,8 +280,6 @@ struct CV_EXPORTS_W RefineParameters {
       * If it set to false, only the provided corner order is considered (default true).
       */
     CV_PROP_RW bool checkAllOrders;
-private:
-    bool readWrite(const Ptr<FileNode>& readNode = nullptr, const Ptr<FileStorage>& writeStorage = nullptr);
 };
 
 /**

diff --git a/modules/aruco/src/aruco_detector.cpp b/modules/aruco/src/aruco_detector.cpp
@@ -67,27 +67,28 @@ bool DetectorParameters::writeDetectorParameters(const Ptr<FileStorage>& fs)
     return readWrite(nullptr, fs);
 }
 
-bool RefineParameters::readWrite(const Ptr<FileNode>& readNode, const Ptr<FileStorage>& writeStorage) {
+static inline bool readWrite(RefineParameters& refineParameters, const Ptr<FileNode>& readNode,
+                             const Ptr<FileStorage>& writeStorage = nullptr) {
     CV_Assert(!readNode.empty() || !writeStorage.empty());
     bool check = false;
 
-    check |= readWriteParameter("minRepDistance", this->minRepDistance, readNode, writeStorage);
-    check |= readWriteParameter("errorCorrectionRate", this->errorCorrectionRate, readNode, writeStorage);
-    check |= readWriteParameter("checkAllOrders", this->checkAllOrders, readNode, writeStorage);
+    check |= readWriteParameter("minRepDistance", refineParameters.minRepDistance, readNode, writeStorage);
+    check |= readWriteParameter("errorCorrectionRate", refineParameters.errorCorrectionRate, readNode, writeStorage);
+    check |= readWriteParameter("checkAllOrders", refineParameters.checkAllOrders, readNode, writeStorage);
     return check;
 }
 
 bool RefineParameters::readRefineParameters(const FileNode &fn) {
     if(fn.empty())
         return false;
     Ptr<FileNode> pfn = makePtr<FileNode>(fn);
-    return readWrite(pfn);
+    return readWrite(*this, pfn);
 }
 
 bool RefineParameters::writeRefineParameters(const Ptr<FileStorage> &fs) {
     if(fs.empty())
         return false;
-    return readWrite(nullptr, fs);
+    return readWrite(*this, nullptr, fs);
 }
 
 /**