From 0fcd0160662941a9ba800b36671e88d82790bd95 Mon Sep 17 00:00:00 2001 From: Christoph Stein Date: Mon, 3 Jul 2017 11:55:35 +0200 Subject: 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 --- src/svg/qsvghandler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') 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); -- cgit v1.2.1