diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2013-04-19 11:21:39 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2013-04-19 11:21:39 +0200 |
| commit | 9cd2d14005def8e7df0b0bf5fd6eb51f8a6591e9 (patch) | |
| tree | ca4df13b58e923bdebd9d5f59aecda9d1e30ca58 /Eigen/src/Geometry/Quaternion.h | |
| parent | 4e2e615a7c2c719d2d708ab32840bad353322d8c (diff) | |
| parent | 46755648ec341aa5e0283b47456108bb2897b1b3 (diff) | |
merge with default branch
Diffstat (limited to 'Eigen/src/Geometry/Quaternion.h')
| -rw-r--r-- | Eigen/src/Geometry/Quaternion.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Geometry/Quaternion.h b/Eigen/src/Geometry/Quaternion.h index 45824fbeb..d036c018a 100644 --- a/Eigen/src/Geometry/Quaternion.h +++ b/Eigen/src/Geometry/Quaternion.h @@ -154,7 +154,7 @@ public: * \a t in [0;1] * see http://en.wikipedia.org/wiki/Slerp */ - template<class OtherDerived> Quaternion<Scalar> slerp(Scalar t, const QuaternionBase<OtherDerived>& other) const; + template<class OtherDerived> Quaternion<Scalar> slerp(const Scalar& t, const QuaternionBase<OtherDerived>& other) const; /** \returns \c true if \c *this is approximately equal to \a other, within the precision * determined by \a prec. @@ -683,7 +683,7 @@ QuaternionBase<Derived>::angularDistance(const QuaternionBase<OtherDerived>& oth template <class Derived> template <class OtherDerived> Quaternion<typename internal::traits<Derived>::Scalar> -QuaternionBase<Derived>::slerp(Scalar t, const QuaternionBase<OtherDerived>& other) const +QuaternionBase<Derived>::slerp(const Scalar& t, const QuaternionBase<OtherDerived>& other) const { using std::acos; using std::sin; |