aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Geometry
diff options
context:
space:
mode:
authorGravatar Sergiu Dotenco <sergiu.dotenco@gmail.com>2015-08-20 20:55:37 +0200
committerGravatar Sergiu Dotenco <sergiu.dotenco@gmail.com>2015-08-20 20:55:37 +0200
commitd4c24eb01630c21aa0a83a77511fff9f689aefa8 (patch)
treeffa17e71de1ea92348f8904dbe3442c13a5ad1db /Eigen/src/Geometry
parent78358a72419482a8b58c2b0caa56ffa2aede995a (diff)
fixed Quaternion identity initialization for non-implicitly convertible types
Diffstat (limited to 'Eigen/src/Geometry')
-rw-r--r--Eigen/src/Geometry/Quaternion.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Geometry/Quaternion.h b/Eigen/src/Geometry/Quaternion.h
index 7a30dc0b6..19276b96a 100644
--- a/Eigen/src/Geometry/Quaternion.h
+++ b/Eigen/src/Geometry/Quaternion.h
@@ -103,11 +103,11 @@ class QuaternionBase : public RotationBase<Derived, 3>
/** \returns a quaternion representing an identity rotation
* \sa MatrixBase::Identity()
*/
- static inline Quaternion<Scalar> Identity() { return Quaternion<Scalar>(1, 0, 0, 0); }
+ static inline Quaternion<Scalar> Identity() { return Quaternion<Scalar>(Scalar(1), Scalar(0), Scalar(0), Scalar(0)); }
/** \sa QuaternionBase::Identity(), MatrixBase::setIdentity()
*/
- inline QuaternionBase& setIdentity() { coeffs() << 0, 0, 0, 1; return *this; }
+ inline QuaternionBase& setIdentity() { coeffs() << Scalar(0), Scalar(0), Scalar(0), Scalar(1); return *this; }
/** \returns the squared norm of the quaternion's coefficients
* \sa QuaternionBase::norm(), MatrixBase::squaredNorm()