fixed msvc compile warning
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 17 Oct 2014 11:56:27 +0000 (15:56 +0400)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 17 Oct 2014 11:56:27 +0000 (15:56 +0400)
modules/calib3d/src/solvepnp.cpp

index bf84648..bdc32c6 100644 (file)
@@ -116,7 +116,7 @@ bool cv::solvePnP( InputArray _opoints, InputArray _ipoints,
         double f = PnP.compute_pose(R, tvec);
         cv::Rodrigues(R, rvec);
         if(cameraMatrix.type() == CV_32F)
-            cameraMatrix.at<float>(0,0) = cameraMatrix.at<float>(1,1) = f;
+            cameraMatrix.at<float>(0,0) = cameraMatrix.at<float>(1,1) = (float)f;
         else
             cameraMatrix.at<double>(0,0) = cameraMatrix.at<double>(1,1) = f;
         return true;