Merge pull request #3330 from vpisarev:fix_upnp_perf

83ef2766 · Vadim Pisarevsky · a7983866 · 3b250d6e · 83ef2766
Commit 83ef2766 authored Oct 12, 2014 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

perf_pnp.cpp modules/calib3d/perf/perf_pnp.cpp +2 -2

No files found.
--- a/modules/calib3d/perf/perf_pnp.cpp
+++ b/modules/calib3d/perf/perf_pnp.cpp
@@ -79,8 +79,8 @@ PERF_TEST_P(PointsNum_Algo, solvePnPSmallPoints,

    Mat distortion = Mat::zeros(5, 1, CV_32FC1);
    Mat intrinsics = Mat::eye(3, 3, CV_32FC1);
-    intrinsics.at<float> (0, 0) = 400.0;
-    intrinsics.at<float> (1, 1) = 400.0;
+    intrinsics.at<float> (0, 0) = 400.0f;
+    intrinsics.at<float> (1, 1) = 400.0f;
    intrinsics.at<float> (0, 2) = 640 / 2;
    intrinsics.at<float> (1, 2) = 480 / 2;