forward-port Anthony Truchet's changeset 8eab0bccbf8b1969f32bb006b61d2137f6f37ead

This commit is contained in:
Benoit Jacob 2009-07-30 16:05:38 +02:00
parent 8d2cd744b0
commit d8bfd151d1

View File

@ -537,9 +537,9 @@ template<typename Scalar, int Dim, int Mode>
QMatrix Transform<Scalar,Dim,Mode>::toQMatrix(void) const QMatrix Transform<Scalar,Dim,Mode>::toQMatrix(void) const
{ {
EIGEN_STATIC_ASSERT(Dim==2, YOU_MADE_A_PROGRAMMING_MISTAKE) EIGEN_STATIC_ASSERT(Dim==2, YOU_MADE_A_PROGRAMMING_MISTAKE)
return QMatrix(other.coeffRef(0,0), other.coeffRef(1,0), return QMatrix(matrix.coeff(0,0), matrix.coeff(1,0),
other.coeffRef(0,1), other.coeffRef(1,1), matrix.coeff(0,1), matrix.coeff(1,1),
other.coeffRef(0,2), other.coeffRef(1,2)); matrix.coeff(0,2), matrix.coeff(1,2));
} }
/** Initialises \c *this from a QTransform assuming the dimension is 2. /** Initialises \c *this from a QTransform assuming the dimension is 2.
@ -571,12 +571,12 @@ Transform<Scalar,Dim,Mode>& Transform<Scalar,Dim,Mode>::operator=(const QTransfo
* This function is available only if the token EIGEN_QT_SUPPORT is defined. * This function is available only if the token EIGEN_QT_SUPPORT is defined.
*/ */
template<typename Scalar, int Dim, int Mode> template<typename Scalar, int Dim, int Mode>
QMatrix Transform<Scalar,Dim,Mode>::toQTransform(void) const QTransform Transform<Scalar,Dim,Mode>::toQTransform(void) const
{ {
EIGEN_STATIC_ASSERT(Dim==2, YOU_MADE_A_PROGRAMMING_MISTAKE) EIGEN_STATIC_ASSERT(Dim==2, YOU_MADE_A_PROGRAMMING_MISTAKE)
return QTransform(other.coeffRef(0,0), other.coeffRef(1,0), other.coeffRef(2,0) return QTransform(matrix.coeff(0,0), matrix.coeff(1,0), matrix.coeff(2,0)
other.coeffRef(0,1), other.coeffRef(1,1), other.coeffRef(2,1) matrix.coeff(0,1), matrix.coeff(1,1), matrix.coeff(2,1)
other.coeffRef(0,2), other.coeffRef(1,2), other.coeffRef(2,2); matrix.coeff(0,2), matrix.coeff(1,2), matrix.coeff(2,2);
} }
#endif #endif