Update code

modules/calib3d/src/dls.cpp

@@ -662,11 +662,3 @@ bool dls::positive_eigenvalues(const cv::Mat * eigenvalues)
     cv::MatConstIterator_<double> it = eigenvalues->begin<double>();
     return *(it) > 0 && *(it+1) > 0 && *(it+2) > 0;
 }
-
-
-
-
-
-
-
-

samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/CsvReader.cpp

-#include <string>
 #include "CsvReader.h"
 
 /** The default constructor of the CSV reader Class */
@@ -10,7 +9,7 @@ CsvReader::CsvReader(const std::string &path, const char &separator){
 /* Read a plane text file with .ply format */
 void CsvReader::readPLY(std::vector<cv::Point3f> &list_vertex, std::vector<std::vector<int> > &list_triangles)
 {
-std::string line, tmp_str, n;
+    std::string line, tmp_str, n;
     int num_vertex, num_triangles;
     int count = 0;
     bool end_header = false;
@@ -28,8 +27,8 @@ std::string line, tmp_str, n;
         {
             getline(liness, tmp_str, _separator);
             getline(liness, n);
-          if(tmp_str == "vertex") num_vertex = std::stoi(n);
-          if(tmp_str == "face") num_triangles = std::stoi(n);
+            if(tmp_str == "vertex") num_vertex = StringToNumber(n);
+            if(tmp_str == "face") num_triangles = StringToNumber(n);
         }
         if(tmp_str == "end_header") end_header = true;
     }
@@ -46,9 +45,9 @@ std::string line, tmp_str, n;
              getline(liness, z);
 
              cv::Point3f tmp_p;
-        tmp_p.x = std::stof(x);
-        tmp_p.y = std::stof(y);
-        tmp_p.z = std::stof(z);
+             tmp_p.x = StringToNumber(x);
+             tmp_p.y = StringToNumber(y);
+             tmp_p.z = StringToNumber(z);
              list_vertex.push_back(tmp_p);
 
              count++;
@@ -68,9 +67,9 @@ std::string line, tmp_str, n;
              getline(liness, id2);
 
              std::vector<int> tmp_triangle(3);
-        tmp_triangle[0] = std::stoi(id0);
-        tmp_triangle[1] = std::stoi(id1);
-        tmp_triangle[2] = std::stoi(id2);
+             tmp_triangle[0] = StringToNumber(id0);
+             tmp_triangle[1] = StringToNumber(id1);
+             tmp_triangle[2] = StringToNumber(id2);
              list_triangles.push_back(tmp_triangle);
 
              count++;
@@ -78,4 +77,3 @@ std::string line, tmp_str, n;
     }
   }
 }
-

samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/Model.cpp

@@ -71,5 +71,3 @@ void Model::load(const std::string path)
   storage.release();
 
 }
-
-

samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/ModelRegistration.cpp

@@ -33,6 +33,3 @@ void ModelRegistration::reset()
   list_points2d_.clear();
   list_points3d_.clear();
 }
-
-
-

samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/PnPProblem.cpp

@@ -310,6 +310,3 @@ bool PnPProblem::intersect_MollerTrumbore(Ray &Ray, Triangle &Triangle, double *
   // No hit, no win
   return false;
 }
-
-
-

samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/Utils.cpp

@@ -273,4 +273,3 @@ cv::Mat euler2rot(const cv::Mat & euler)
 
   return rotationMatrix;
 }
-

samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/test_pnp.cpp

@@ -141,4 +141,3 @@ int main(int argc, char *argv[])
   data2file("computation_time.txt", comp_time);
 
 }
-