diff options
| author |  Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2014-05-05 14:22:27 +0200 |
|---|---|---|
| committer | Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2014-05-05 14:22:27 +0200 |
| commit | b5e3d76aa50dd4adc63ebb1e20e6693e261aa7dc (patch) | |
| tree | 8a6d81ee26c92772237f591a8fd9785e2a4f8a56 /Eigen | |
| parent | 0b7f95a03f9678b4cbdbb0bb19227e54b6d05718 (diff) | |
Fixed bug #806: Missing scalar type cast in Quaternion::setFromTwoVectors()
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Geometry/Quaternion.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Eigen/src/Geometry/Quaternion.h b/Eigen/src/Geometry/Quaternion.h index a712692e5..11e5398d4 100644 --- a/Eigen/src/Geometry/Quaternion.h +++ b/Eigen/src/Geometry/Quaternion.h @@ -587,7 +587,7 @@ inline Derived& QuaternionBase<Derived>::setFromTwoVectors(const MatrixBase<Deri // which yields a singular value problem if (c < Scalar(-1)+NumTraits<Scalar>::dummy_precision()) { - c = max<Scalar>(c,-1); + c = (max)(c,Scalar(-1)); Matrix<Scalar,2,3> m; m << v0.transpose(), v1.transpose(); JacobiSVD<Matrix<Scalar,2,3> > svd(m, ComputeFullV); Vector3 axis = svd.matrixV().col(2); |