Merge pull request #3270 from boaz001:patch-1

modules/calib3d/test/test_affine3d_estimator.cpp

@@ -80,9 +80,9 @@ struct WrapAff
     WrapAff(const Mat& aff) : F(aff.ptr<double>()) {}
     Point3f operator()(const Point3f& p)
     {
-        return Point3d( p.x * F[0] + p.y * F[1] + p.z *  F[2] +  F[3],
-                        p.x * F[4] + p.y * F[5] + p.z *  F[6] +  F[7],
-                        p.x * F[8] + p.y * F[9] + p.z * F[10] + F[11]  );
+        return Point3f( (float)(p.x * F[0] + p.y * F[1] + p.z *  F[2] +  F[3]),
+                        (float)(p.x * F[4] + p.y * F[5] + p.z *  F[6] +  F[7]),
+                        (float)(p.x * F[8] + p.y * F[9] + p.z * F[10] + F[11])  );
     }
 };
 

modules/video/test/test_estimaterigid.cpp

@@ -75,8 +75,8 @@ struct WrapAff2D
     WrapAff2D(const Mat& aff) : F(aff.ptr<double>()) {}
     Point2f operator()(const Point2f& p)
     {
-        return Point2d( p.x * F[0] + p.y * F[1] +  F[2],
-                        p.x * F[3] + p.y * F[4] +  F[5]);
+        return Point2f( (float)(p.x * F[0] + p.y * F[1] + F[2]),
+                        (float)(p.x * F[3] + p.y * F[4] + F[5]) );
     }
 };