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

Fixed C++11 compatibility warning

Browse Source
This commit is contained in:
unknown
2014-07-09 14:19:15 +02:00
parent 2c29ee9e00
commit 52c05e75cc
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/calib3d/src/solvepnp.cpp
View File

@@ -162,7 +162,7 @@ namespace cv
for (int i = 0; i < MIN_POINTS_COUNT; i++) for (int i = 0; i < MIN_POINTS_COUNT; i++)
for (int j = i + 1; j < MIN_POINTS_COUNT; j++) for (int j = i + 1; j < MIN_POINTS_COUNT; j++)
{ {
if (norm(modelObjectPoints.at<Vec<OpointType,3>>(0, i) - modelObjectPoints.at<Vec<OpointType,3>>(0, j)) < eps) if (norm(modelObjectPoints.at<Vec<OpointType,3> >(0, i) - modelObjectPoints.at<Vec<OpointType,3> >(0, j)) < eps)
num_same_points++; num_same_points++;
} }
if (num_same_points > 0) if (num_same_points > 0)
@@ -176,7 +176,7 @@ namespace cv
params.useExtrinsicGuess, params.flags); params.useExtrinsicGuess, params.flags);
vector<Point_<OpointType>> projected_points; vector<Point_<OpointType> > projected_points;
projected_points.resize(objectPoints.cols); projected_points.resize(objectPoints.cols);
projectPoints(objectPoints, localRvec, localTvec, params.camera.intrinsics, params.camera.distortion, projected_points); projectPoints(objectPoints, localRvec, localTvec, params.camera.intrinsics, params.camera.distortion, projected_points);
@@ -187,10 +187,10 @@ namespace cv
for (int i = 0; i < objectPoints.cols; i++) for (int i = 0; i < objectPoints.cols; i++)
{ {
//Although p is a 2D point it needs the same type as the object points to enable the norm calculation //Although p is a 2D point it needs the same type as the object points to enable the norm calculation
Point_<OpointType> p((OpointType)imagePoints.at<Vec<IpointType,2>>(0, i)[0], Point_<OpointType> p((OpointType)imagePoints.at<Vec<IpointType,2> >(0, i)[0],
(OpointType)imagePoints.at<Vec<IpointType,2>>(0, i)[1]); (OpointType)imagePoints.at<Vec<IpointType,2> >(0, i)[1]);
if ((norm(p - projected_points[i]) < params.reprojectionError) if ((norm(p - projected_points[i]) < params.reprojectionError)
&& (rotatedPoints.at<Vec<OpointType,3>>(0, i)[2] > 0)) //hack && (rotatedPoints.at<Vec<OpointType,3> >(0, i)[2] > 0)) //hack
{ {
localInliers.push_back(i); localInliers.push_back(i);
} }