generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update code

Browse Source
This commit is contained in:
edgarriba
2014-08-05 17:27:20 +02:00
parent 0d2bc9b0a1
commit 7b0be9cf8f
9 changed files with 57 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/calib3d/src/dls.cpp
View File

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

18
samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/CsvReader.cpp
View File

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

2
samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/Model.cpp
View File

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

3
samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/ModelRegistration.cpp
View File

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

3
samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/PnPProblem.cpp
View File

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

1
samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/Utils.cpp
View File

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

1
samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/test_pnp.cpp
View File

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