diff options
Diffstat (limited to 'Eigen/src/Geometry')
| -rw-r--r-- | Eigen/src/Geometry/AngleAxis.h | 2 | ||||
| -rw-r--r-- | Eigen/src/Geometry/Quaternion.h | 2 | ||||
| -rw-r--r-- | Eigen/src/Geometry/Rotation2D.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/Geometry/AngleAxis.h b/Eigen/src/Geometry/AngleAxis.h index 289b3e62d..3c8b7d027 100644 --- a/Eigen/src/Geometry/AngleAxis.h +++ b/Eigen/src/Geometry/AngleAxis.h @@ -147,7 +147,7 @@ public: inline explicit AngleAxis(const AngleAxis<OtherScalarType>& other) { m_axis = other.axis().template cast<Scalar>(); - m_angle = other.angle(); + m_angle = Scalar(other.angle()); } /** \returns \c true if \c *this is approximately equal to \a other, within the precision diff --git a/Eigen/src/Geometry/Quaternion.h b/Eigen/src/Geometry/Quaternion.h index 31ea9ef36..058eff7f1 100644 --- a/Eigen/src/Geometry/Quaternion.h +++ b/Eigen/src/Geometry/Quaternion.h @@ -459,7 +459,7 @@ struct ei_quaternion_assign_impl<Other,3,3> int j = (i+1)%3; int k = (j+1)%3; - t = ei_sqrt(mat.coeff(i,i)-mat.coeff(j,j)-mat.coeff(k,k) + 1.0); + t = Scalar(ei_sqrt(mat.coeff(i,i)-mat.coeff(j,j)-mat.coeff(k,k) + 1.0)); q.coeffs().coeffRef(i) = Scalar(0.5) * t; t = Scalar(0.5)/t; q.w() = (mat.coeff(k,j)-mat.coeff(j,k))*t; diff --git a/Eigen/src/Geometry/Rotation2D.h b/Eigen/src/Geometry/Rotation2D.h index f638ee245..5dea645c8 100644 --- a/Eigen/src/Geometry/Rotation2D.h +++ b/Eigen/src/Geometry/Rotation2D.h @@ -114,7 +114,7 @@ public: template<typename OtherScalarType> inline explicit Rotation2D(const Rotation2D<OtherScalarType>& other) { - m_angle = other.angle(); + m_angle = Scalar(other.angle()); } /** \returns \c true if \c *this is approximately equal to \a other, within the precision |