fix readDetectorParameters()

Author: AleksandrPanov

modules/aruco/include/opencv2/aruco.hpp

@@ -151,7 +151,7 @@ struct CV_EXPORTS_W DetectorParameters {
 
     DetectorParameters();
     CV_WRAP static Ptr<DetectorParameters> create();
-    CV_WRAP static bool readDetectorParameters(const FileNode& fn, Ptr<DetectorParameters>& params);
+    CV_WRAP bool readDetectorParameters(const FileNode& fn);
 
     CV_PROP_RW int adaptiveThreshWinSizeMin;
     CV_PROP_RW int adaptiveThreshWinSizeMax;

modules/aruco/samples/calibrate_camera.cpp

@@ -104,7 +104,7 @@ int main(int argc, char *argv[]) {
     Ptr<aruco::DetectorParameters> detectorParams = aruco::DetectorParameters::create();
     if(parser.has("dp")) {
         FileStorage fs(parser.get<string>("dp"), FileStorage::READ);
-        bool readOk = aruco::DetectorParameters::readDetectorParameters(fs.root(), detectorParams);
+        bool readOk = detectorParams->readDetectorParameters(fs.root());
         if(!readOk) {
             cerr << "Invalid detector parameters file" << endl;
             return 0;

modules/aruco/samples/calibrate_camera_charuco.cpp

@@ -105,7 +105,7 @@ int main(int argc, char *argv[]) {
     Ptr<aruco::DetectorParameters> detectorParams = aruco::DetectorParameters::create();
     if(parser.has("dp")) {
         FileStorage fs(parser.get<string>("dp"), FileStorage::READ);
-        bool readOk = aruco::DetectorParameters::readDetectorParameters(fs.root(), detectorParams);
+        bool readOk = detectorParams->readDetectorParameters(fs.root());
         if(!readOk) {
             cerr << "Invalid detector parameters file" << endl;
             return 0;

modules/aruco/samples/detect_board.cpp

@@ -100,7 +100,7 @@ int main(int argc, char *argv[]) {
     Ptr<aruco::DetectorParameters> detectorParams = aruco::DetectorParameters::create();
     if(parser.has("dp")) {
         FileStorage fs(parser.get<string>("dp"), FileStorage::READ);
-        bool readOk = aruco::DetectorParameters::readDetectorParameters(fs.root(), detectorParams);
+        bool readOk = detectorParams->readDetectorParameters(fs.root());
         if(!readOk) {
             cerr << "Invalid detector parameters file" << endl;
             return 0;

modules/aruco/samples/detect_board_charuco.cpp

@@ -102,7 +102,7 @@ int main(int argc, char *argv[]) {
     Ptr<aruco::DetectorParameters> detectorParams = aruco::DetectorParameters::create();
     if(parser.has("dp")) {
         FileStorage fs(parser.get<string>("dp"), FileStorage::READ);
-        bool readOk = aruco::DetectorParameters::readDetectorParameters(fs.root(), detectorParams);
+        bool readOk = detectorParams->readDetectorParameters(fs.root());
         if(!readOk) {
             cerr << "Invalid detector parameters file" << endl;
             return 0;

modules/aruco/samples/detect_diamonds.cpp

@@ -90,7 +90,7 @@ int main(int argc, char *argv[]) {
     Ptr<aruco::DetectorParameters> detectorParams = aruco::DetectorParameters::create();
     if(parser.has("dp")) {
         FileStorage fs(parser.get<string>("dp"), FileStorage::READ);
-        bool readOk = aruco::DetectorParameters::readDetectorParameters(fs.root(), detectorParams);
+        bool readOk = detectorParams->readDetectorParameters(fs.root());
         if(!readOk) {
             cerr << "Invalid detector parameters file" << endl;
             return 0;

modules/aruco/samples/detect_markers.cpp

@@ -83,7 +83,7 @@ int main(int argc, char *argv[]) {
     Ptr<aruco::DetectorParameters> detectorParams = aruco::DetectorParameters::create();
     if(parser.has("dp")) {
         FileStorage fs(parser.get<string>("dp"), FileStorage::READ);
-        bool readOk = aruco::DetectorParameters::readDetectorParameters(fs.root(), detectorParams);
+        bool readOk = detectorParams->readDetectorParameters(fs.root());
         if(!readOk) {
             cerr << "Invalid detector parameters file" << endl;
             return 0;

modules/aruco/src/aruco.cpp

@@ -111,32 +111,31 @@ static inline bool readParameter(const FileNode& node, T& parameter)
 /**
   * @brief Read a new set of DetectorParameters from FileStorage.
   */
-bool DetectorParameters::readDetectorParameters(const FileNode& fn, Ptr<DetectorParameters>& params)
+bool DetectorParameters::readDetectorParameters(const FileNode& fn)
 {
     if(fn.empty())
         return true;
-    params = DetectorParameters::create();
     bool checkRead = false;
-    checkRead |= readParameter(fn["adaptiveThreshWinSizeMin"], params->adaptiveThreshWinSizeMin);
-    checkRead |= readParameter(fn["adaptiveThreshWinSizeMax"], params->adaptiveThreshWinSizeMax);
-    checkRead |= readParameter(fn["adaptiveThreshWinSizeStep"], params->adaptiveThreshWinSizeStep);
-    checkRead |= readParameter(fn["adaptiveThreshConstant"], params->adaptiveThreshConstant);
-    checkRead |= readParameter(fn["minMarkerPerimeterRate"], params->minMarkerPerimeterRate);
-    checkRead |= readParameter(fn["maxMarkerPerimeterRate"], params->maxMarkerPerimeterRate);
-    checkRead |= readParameter(fn["polygonalApproxAccuracyRate"], params->polygonalApproxAccuracyRate);
-    checkRead |= readParameter(fn["minCornerDistanceRate"], params->minCornerDistanceRate);
-    checkRead |= readParameter(fn["minDistanceToBorder"], params->minDistanceToBorder);
-    checkRead |= readParameter(fn["minMarkerDistanceRate"], params->minMarkerDistanceRate);
-    checkRead |= readParameter(fn["cornerRefinementMethod"], params->cornerRefinementMethod);
-    checkRead |= readParameter(fn["cornerRefinementWinSize"], params->cornerRefinementWinSize);
-    checkRead |= readParameter(fn["cornerRefinementMaxIterations"], params->cornerRefinementMaxIterations);
-    checkRead |= readParameter(fn["cornerRefinementMinAccuracy"], params->cornerRefinementMinAccuracy);
-    checkRead |= readParameter(fn["markerBorderBits"], params->markerBorderBits);
-    checkRead |= readParameter(fn["perspectiveRemovePixelPerCell"], params->perspectiveRemovePixelPerCell);
-    checkRead |= readParameter(fn["perspectiveRemoveIgnoredMarginPerCell"], params->perspectiveRemoveIgnoredMarginPerCell);
-    checkRead |= readParameter(fn["maxErroneousBitsInBorderRate"], params->maxErroneousBitsInBorderRate);
-    checkRead |= readParameter(fn["minOtsuStdDev"], params->minOtsuStdDev);
-    checkRead |= readParameter(fn["errorCorrectionRate"], params->errorCorrectionRate);
+    checkRead |= readParameter(fn["adaptiveThreshWinSizeMin"], this->adaptiveThreshWinSizeMin);
+    checkRead |= readParameter(fn["adaptiveThreshWinSizeMax"], this->adaptiveThreshWinSizeMax);
+    checkRead |= readParameter(fn["adaptiveThreshWinSizeStep"], this->adaptiveThreshWinSizeStep);
+    checkRead |= readParameter(fn["adaptiveThreshConstant"], this->adaptiveThreshConstant);
+    checkRead |= readParameter(fn["minMarkerPerimeterRate"], this->minMarkerPerimeterRate);
+    checkRead |= readParameter(fn["maxMarkerPerimeterRate"], this->maxMarkerPerimeterRate);
+    checkRead |= readParameter(fn["polygonalApproxAccuracyRate"], this->polygonalApproxAccuracyRate);
+    checkRead |= readParameter(fn["minCornerDistanceRate"], this->minCornerDistanceRate);
+    checkRead |= readParameter(fn["minDistanceToBorder"], this->minDistanceToBorder);
+    checkRead |= readParameter(fn["minMarkerDistanceRate"], this->minMarkerDistanceRate);
+    checkRead |= readParameter(fn["cornerRefinementMethod"], this->cornerRefinementMethod);
+    checkRead |= readParameter(fn["cornerRefinementWinSize"], this->cornerRefinementWinSize);
+    checkRead |= readParameter(fn["cornerRefinementMaxIterations"], this->cornerRefinementMaxIterations);
+    checkRead |= readParameter(fn["cornerRefinementMinAccuracy"], this->cornerRefinementMinAccuracy);
+    checkRead |= readParameter(fn["markerBorderBits"], this->markerBorderBits);
+    checkRead |= readParameter(fn["perspectiveRemovePixelPerCell"], this->perspectiveRemovePixelPerCell);
+    checkRead |= readParameter(fn["perspectiveRemoveIgnoredMarginPerCell"], this->perspectiveRemoveIgnoredMarginPerCell);
+    checkRead |= readParameter(fn["maxErroneousBitsInBorderRate"], this->maxErroneousBitsInBorderRate);
+    checkRead |= readParameter(fn["minOtsuStdDev"], this->minOtsuStdDev);
+    checkRead |= readParameter(fn["errorCorrectionRate"], this->errorCorrectionRate);
     return checkRead;
 }
 

modules/aruco/src/dictionary.cpp

@@ -96,7 +96,7 @@ static inline bool readParameter(const FileNode& node, T& parameter)
 
 bool Dictionary::readDictionary(const cv::FileNode& fn)
 {
-    int nMarkers = 0, _markerSize = 0;//
+    int nMarkers = 0, _markerSize = 0;
     if (fn.empty() || !readParameter(fn["nmarkers"], nMarkers) || !readParameter(fn["markersize"], _markerSize))
         return false;
     Mat bytes(0, 0, CV_8UC1), marker(_markerSize, _markerSize, CV_8UC1);

modules/aruco/test/test_arucodetection.cpp

@@ -597,7 +597,7 @@ TEST(CV_ArucoTutorial, can_find_gboriginal)
     cv::Ptr<cv::aruco::Dictionary> dictionary;
 
     FileStorage fs(dictPath, FileStorage::READ);
-    aruco::Dictionary::readDictionary(fs.root(), dictionary); // set marker from tutorial_dict.yml
+    dictionary->aruco::Dictionary::readDictionary(fs.root()); // set marker from tutorial_dict.yml
 
     Ptr<aruco::DetectorParameters> detectorParams = aruco::DetectorParameters::create();