Optimise QMatrix and QTransform

Add some private inline constructors and do inlining
other places.
All test still pass.

1 files changed, 40 insertions, 23 deletions

diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp
index 4439d5223e..31abcad4be 100644
--- a/src/gui/painting/qmatrix.cpp
+++ b/src/gui/painting/qmatrix.cpp
@@ -208,9 +208,13 @@ QT_BEGIN_NAMESPACE
 */
 
 QMatrix::QMatrix()
+    : _m11(1.)
+    , _m12(0.)
+    , _m21(0.)
+    , _m22(1.)
+    , _dx(0.)
+    , _dy(0.)
 {
-    _m11 = _m22 = 1.0;
-    _m12 = _m21 = _dx = _dy = 0.0;
 }
 
 /*!
@@ -220,12 +224,14 @@ QMatrix::QMatrix()
     \sa setMatrix()
 */
 
-QMatrix::QMatrix(qreal m11, qreal m12, qreal m21, qreal m22,
-                    qreal dx, qreal dy)
+QMatrix::QMatrix(qreal m11, qreal m12, qreal m21, qreal m22, qreal dx, qreal dy)
+    : _m11(m11)
+    , _m12(m12)
+    , _m21(m21)
+    , _m22(m22)
+    , _dx(dx)
+    , _dy(dy)
 {
-    _m11 = m11;         _m12 = m12;
-    _m21 = m21;         _m22 = m22;
-    _dx         = dx;         _dy  = dy;
 }
 
 
@@ -233,8 +239,13 @@ QMatrix::QMatrix(qreal m11, qreal m12, qreal m21, qreal m22,
      Constructs a matrix that is a copy of the given \a matrix.
  */
 QMatrix::QMatrix(const QMatrix &matrix)
+    : _m11(matrix._m11)
+    , _m12(matrix._m12)
+    , _m21(matrix._m21)
+    , _m22(matrix._m22)
+    , _dx(matrix._dx)
+    , _dy(matrix._dy)
 {
-    *this = matrix;
 }
 
 /*!
@@ -249,12 +260,14 @@ QMatrix::QMatrix(const QMatrix &matrix)
     \sa QMatrix()
 */
 
-void QMatrix::setMatrix(qreal m11, qreal m12, qreal m21, qreal m22,
-                          qreal dx, qreal dy)
+void QMatrix::setMatrix(qreal m11, qreal m12, qreal m21, qreal m22, qreal dx, qreal dy)
 {
-    _m11 = m11;         _m12 = m12;
-    _m21 = m21;         _m22 = m22;
-    _dx         = dx;         _dy  = dy;
+    _m11 = m11;
+    _m12 = m12;
+    _m21 = m21;
+    _m22 = m22;
+    _dx  = dx;
+    _dy  = dy;
 }
 
 
@@ -968,18 +981,17 @@ QMatrix QMatrix::inverted(bool *invertible) const
     if (determinant == 0.0) {
         if (invertible)
             *invertible = false;                // singular matrix
-        QMatrix defaultMatrix;
-        return defaultMatrix;
+        return QMatrix(true);
     }
     else {                                        // invertible matrix
         if (invertible)
             *invertible = true;
         qreal dinv = 1.0/determinant;
-        QMatrix imatrix((_m22*dinv),        (-_m12*dinv),
-                          (-_m21*dinv), (_m11*dinv),
-                          ((_m21*_dy - _m22*_dx)*dinv),
-                          ((_m12*_dx - _m11*_dy)*dinv));
-        return imatrix;
+        return QMatrix((_m22*dinv),        (-_m12*dinv),
+                       (-_m21*dinv), (_m11*dinv),
+                       ((_m21*_dy - _m22*_dx)*dinv),
+                       ((_m12*_dx - _m11*_dy)*dinv),
+                       true);
     }
 }
 
@@ -1054,9 +1066,14 @@ QMatrix &QMatrix::operator *=(const QMatrix &m)
 
 QMatrix QMatrix::operator *(const QMatrix &m) const
 {
-    QMatrix result = *this;
-    result *= m;
-    return result;
+    qreal tm11 = _m11*m._m11 + _m12*m._m21;
+    qreal tm12 = _m11*m._m12 + _m12*m._m22;
+    qreal tm21 = _m21*m._m11 + _m22*m._m21;
+    qreal tm22 = _m21*m._m12 + _m22*m._m22;
+
+    qreal tdx  = _dx*m._m11  + _dy*m._m21 + m._dx;
+    qreal tdy =  _dx*m._m12  + _dy*m._m22 + m._dy;
+    return QMatrix(tm11, tm12, tm21, tm22, tdx, tdy, true);
 }
 
 /*!