diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-04-08 00:46:23 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-04-08 00:46:23 (GMT) |
| commit | 6fd4a720870775a4d9a645d9000b0259caa74178 (patch) | |
| tree | 84c2f5d439a9d53d8633545eb7432a4ca91fa4ef /src/gui/math3d/qgenericmatrix.h | |
| parent | f63976b7c5fd512c00442efd5cb9afb0b3707388 (diff) | |
| parent | a83faaf1bedfd321c4fc759156369d2f86fbbbed (diff) | |
| download | Qt-6fd4a720870775a4d9a645d9000b0259caa74178.zip Qt-6fd4a720870775a4d9a645d9000b0259caa74178.tar.gz Qt-6fd4a720870775a4d9a645d9000b0259caa74178.tar.bz2 | |
Merge branch 'no-math3d-fixed'
Diffstat (limited to 'src/gui/math3d/qgenericmatrix.h')
| -rw-r--r-- | src/gui/math3d/qgenericmatrix.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/math3d/qgenericmatrix.h b/src/gui/math3d/qgenericmatrix.h index dbeaaf3..d0b22de 100644 --- a/src/gui/math3d/qgenericmatrix.h +++ b/src/gui/math3d/qgenericmatrix.h @@ -42,8 +42,8 @@ #ifndef QGENERICMATRIX_H #define QGENERICMATRIX_H -#include <QtGui/qmath3dglobal.h> #include <QtCore/qmetatype.h> +#include <QtCore/qdebug.h> QT_BEGIN_HEADER @@ -134,7 +134,7 @@ template <int N, int M, typename T, typename InnerT> Q_INLINE_TEMPLATE T QGenericMatrix<N, M, T, InnerT>::operator()(int row, int column) const { Q_ASSERT(row >= 0 && row < M && column >= 0 && column < N); - return qt_math3d_convert<T, InnerT>(m[column][row]); + return T(m[column][row]); } template <int N, int M, typename T, typename InnerT> @@ -323,18 +323,18 @@ Q_OUTOFLINE_TEMPLATE void QGenericMatrix<N, M, T, InnerT>::toValueArray(T *value { for (int col = 0; col < N; ++col) for (int row = 0; row < M; ++row) - values[row * N + col] = qt_math3d_convert<T, InnerT>(m[col][row]); + values[row * N + col] = T(m[col][row]); } // Define aliases for the useful variants of QGenericMatrix. -typedef QGenericMatrix<2, 2, qreal, qrealinner> QMatrix2x2; -typedef QGenericMatrix<2, 3, qreal, qrealinner> QMatrix2x3; -typedef QGenericMatrix<2, 4, qreal, qrealinner> QMatrix2x4; -typedef QGenericMatrix<3, 2, qreal, qrealinner> QMatrix3x2; -typedef QGenericMatrix<3, 3, qreal, qrealinner> QMatrix3x3; -typedef QGenericMatrix<3, 4, qreal, qrealinner> QMatrix3x4; -typedef QGenericMatrix<4, 2, qreal, qrealinner> QMatrix4x2; -typedef QGenericMatrix<4, 3, qreal, qrealinner> QMatrix4x3; +typedef QGenericMatrix<2, 2, qreal, float> QMatrix2x2; +typedef QGenericMatrix<2, 3, qreal, float> QMatrix2x3; +typedef QGenericMatrix<2, 4, qreal, float> QMatrix2x4; +typedef QGenericMatrix<3, 2, qreal, float> QMatrix3x2; +typedef QGenericMatrix<3, 3, qreal, float> QMatrix3x3; +typedef QGenericMatrix<3, 4, qreal, float> QMatrix3x4; +typedef QGenericMatrix<4, 2, qreal, float> QMatrix4x2; +typedef QGenericMatrix<4, 3, qreal, float> QMatrix4x3; #ifndef QT_NO_DEBUG_STREAM |