summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Stein <cstein@samson.de>2017-07-03 09:55:35 (GMT)
committerChristoph Stein <cstein@samson.de>2017-07-03 12:24:39 (GMT)
commit0fcd0160662941a9ba800b36671e88d82790bd95 (patch)
tree96c6bc92eb22d18763769a02b69b627ac8ba3322
parent30b5a38023fc256d595942208bbe0afc48dcebcb (diff)
downloadqtsvg-0fcd0160662941a9ba800b36671e88d82790bd95.tar.gz
Fix matrix multiplication in parseTransformationMatrix()
Sequencing of a matrix multiplication seems to be erroneous, this may lead to incorrect svg rendering under certain circumstances Task-number: QTBUG-61568 Change-Id: Id8b6c425d4affde8c71faad455a63a87ef5e13a4 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
-rw-r--r--src/svg/qsvghandler.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index c4e2b03..88d85e3 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -1143,9 +1143,9 @@ static QMatrix parseTransformationMatrix(const QStringRef &value)
if(state == Matrix) {
if(points.count() != 6)
goto error;
- matrix = matrix * QMatrix(points[0], points[1],
- points[2], points[3],
- points[4], points[5]);
+ matrix = QMatrix(points[0], points[1],
+ points[2], points[3],
+ points[4], points[5]) * matrix;
} else if (state == Translate) {
if (points.count() == 1)
matrix.translate(points[0], 0);