diff options
| author |  Robert Lukierski <robert@lukierski.eu> | 2016-10-13 15:00:22 +0100 |
|---|---|---|
| committer | Robert Lukierski <robert@lukierski.eu> | 2016-10-13 15:00:22 +0100 |
| commit | a94791b69a53504aba88f06caad596afa1ac6a34 (patch) | |
| tree | aad3c9de62cdc9f4bdad4ca1d006c2be3bf8fd61 /Eigen/src/Geometry/Quaternion.h | |
| parent | 471075f7ad8e78d4d3e400bc1124e39102515aec (diff) | |
Fixes for min and abs after Benoit's comments, switched to numext.
Diffstat (limited to 'Eigen/src/Geometry/Quaternion.h')
| -rw-r--r-- | Eigen/src/Geometry/Quaternion.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Eigen/src/Geometry/Quaternion.h b/Eigen/src/Geometry/Quaternion.h index 932f149e3..f6ef1bcf6 100644 --- a/Eigen/src/Geometry/Quaternion.h +++ b/Eigen/src/Geometry/Quaternion.h @@ -705,9 +705,8 @@ EIGEN_DEVICE_FUNC inline typename internal::traits<Derived>::Scalar QuaternionBase<Derived>::angularDistance(const QuaternionBase<OtherDerived>& other) const { EIGEN_USING_STD_MATH(atan2) - EIGEN_USING_STD_MATH(abs) Quaternion<Scalar> d = (*this) * other.conjugate(); - return Scalar(2) * atan2( d.vec().norm(), abs(d.w()) ); + return Scalar(2) * atan2( d.vec().norm(), numext::abs(d.w()) ); } @@ -725,10 +724,9 @@ QuaternionBase<Derived>::slerp(const Scalar& t, const QuaternionBase<OtherDerive { EIGEN_USING_STD_MATH(acos) EIGEN_USING_STD_MATH(sin) - EIGEN_USING_STD_MATH(abs) const Scalar one = Scalar(1) - NumTraits<Scalar>::epsilon(); Scalar d = this->dot(other); - Scalar absD = abs(d); + Scalar absD = numext::abs(d); Scalar scale0; Scalar scale1; |