From 7ee378d89da93d2556ba000f59783c4c0e32e9a0 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Fri, 12 Jul 2013 16:40:02 +0200 Subject: Fix various scalar type conversion warnings. --- test/geo_quaternion.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/geo_quaternion.cpp') diff --git a/test/geo_quaternion.cpp b/test/geo_quaternion.cpp index e011879a5..1694b32c7 100644 --- a/test/geo_quaternion.cpp +++ b/test/geo_quaternion.cpp @@ -32,7 +32,7 @@ template void check_slerp(const QuatType& q0, const QuatType& Scalar theta_tot = AA(q1*q0.inverse()).angle(); if(theta_tot>M_PI) theta_tot = Scalar(2.*M_PI)-theta_tot; - for(Scalar t=0; t<=1.001; t+=0.1) + for(Scalar t=0; t<=Scalar(1.001); t+=Scalar(0.1)) { QuatType q = q0.slerp(t,q1); Scalar theta = AA(q*q0.inverse()).angle(); @@ -156,7 +156,7 @@ template void quaternion(void) check_slerp(q1,q2); q1 = AngleAxisx(b, v1.normalized()); - q2 = AngleAxisx(b+M_PI, v1.normalized()); + q2 = AngleAxisx(b+Scalar(M_PI), v1.normalized()); check_slerp(q1,q2); q1 = AngleAxisx(b, v1.normalized()); -- cgit v1.2.3