From 2c29ee9e00c204f0c4b3b3685485c4c9b0350650 Mon Sep 17 00:00:00 2001 From: PhilLab Date: Tue, 8 Jul 2014 13:24:35 +0200 Subject: [PATCH] Added cast and removed formatting error --- modules/calib3d/src/solvepnp.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/calib3d/src/solvepnp.cpp b/modules/calib3d/src/solvepnp.cpp index 2b45524..081d6bd 100644 --- a/modules/calib3d/src/solvepnp.cpp +++ b/modules/calib3d/src/solvepnp.cpp @@ -187,7 +187,8 @@ namespace cv 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 - Point_ p(imagePoints.at>(0, i)[0], imagePoints.at>(0, i)[1]); + Point_ p((OpointType)imagePoints.at>(0, i)[0], + (OpointType)imagePoints.at>(0, i)[1]); if ((norm(p - projected_points[i]) < params.reprojectionError) && (rotatedPoints.at>(0, i)[2] > 0)) //hack { @@ -212,9 +213,9 @@ namespace cv static void pnpTask(const vector& pointsMask, const Mat& objectPoints, const Mat& imagePoints, const Parameters& params, vector& inliers, Mat& rvec, Mat& tvec, const Mat& rvecInit, const Mat& tvecInit, Mutex& resultsMutex) - { - CV_Assert(objectPoints.depth() == CV_64F || objectPoints.depth() == CV_32F); - CV_Assert(imagePoints.depth() == CV_64F || imagePoints.depth() == CV_32F); + { + CV_Assert(objectPoints.depth() == CV_64F || objectPoints.depth() == CV_32F); + CV_Assert(imagePoints.depth() == CV_64F || imagePoints.depth() == CV_32F); const bool objectDoublePrecision = objectPoints.depth() == CV_64F; const bool imageDoublePrecision = imagePoints.depth() == CV_64F; if(objectDoublePrecision) -- 2.7.4