diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-02-03 16:18:20 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-02-28 08:57:57 +0100 |
| commit | 1ba46c9b632731d7d7e791de2b203d0d933245b9 (patch) | |
| tree | a7933031bde57f582181c2e9c185989ebdbb9470 /src/gui/image/qpicture.cpp | |
| parent | d2068b24e4b2e96832af154d02e19b5333880c21 (diff) | |
Get rid of QMatrix
Task-number: QTBUG-81628
Change-Id: Iad66bfdf49b9ee65558a451108c086fc40dc3884
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/gui/image/qpicture.cpp')
| -rw-r--r-- | src/gui/image/qpicture.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index d469ac8aae..73c97f4436 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -465,7 +465,7 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords) QPen pen; QBrush brush; QRegion rgn; - QMatrix wmatrix; + qreal wmatrix[6]; QTransform matrix; QTransform worldMatrix = painter->transform(); @@ -820,8 +820,12 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords) if (d->formatMajor >= 8) { s >> matrix >> i_8; } else { - s >> wmatrix >> i_8; - matrix = QTransform(wmatrix); + s >> wmatrix[0] >> wmatrix[1] + >> wmatrix[2] >> wmatrix[3] + >> wmatrix[4] >> wmatrix[5] >> i_8; + matrix = QTransform(wmatrix[0], wmatrix[1], + wmatrix[2], wmatrix[3], + wmatrix[4], wmatrix[5]); } // i_8 is always false due to updateXForm() in qpaintengine_pic.cpp painter->setTransform(matrix * worldMatrix, i_8); |