diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2015-04-15 14:44:57 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2015-04-15 14:44:57 +0200 |
| commit | 04c8c5d9efdf1f29901b6f1db266b1caf4853b12 (patch) | |
| tree | 665267e4edcc615df80440f7b890eaefca76b5ac /Eigen/src/Geometry/Quaternion.h | |
| parent | 0f82399fe9772898fc1f857a57820a17cb8299ea (diff) | |
Fix bug #996: fix comparisons to 0 instead of Scalar(0)
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 a89d75958..99b65c231 100644 --- a/Eigen/src/Geometry/Quaternion.h +++ b/Eigen/src/Geometry/Quaternion.h @@ -637,7 +637,7 @@ inline Quaternion<typename internal::traits<Derived>::Scalar> QuaternionBase<Der { // FIXME should this function be called multiplicativeInverse and conjugate() be called inverse() or opposite() ?? Scalar n2 = this->squaredNorm(); - if (n2 > 0) + if (n2 > Scalar(0)) return Quaternion<Scalar>(conjugate().coeffs() / n2); else { @@ -723,7 +723,7 @@ QuaternionBase<Derived>::slerp(const Scalar& t, const QuaternionBase<OtherDerive scale0 = sin( ( Scalar(1) - t ) * theta) / sinTheta; scale1 = sin( ( t * theta) ) / sinTheta; } - if(d<0) scale1 = -scale1; + if(d<Scalar(0)) scale1 = -scale1; return Quaternion<Scalar>(scale0 * coeffs() + scale1 * other.coeffs()); } |