summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2009-12-17 09:54:34 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2009-12-17 09:54:34 (GMT)
commit5203626e26d9635ff82b5838fcd2b811361ffc0c (patch)
treedb0df986003cf09478200bf831a620bd8c81b6a9 /src
parentdd678f7564955112b348a2fec56b29a8875e585e (diff)
parent91cc7d1dabfd5f42db45bedefad78a63e63c4dc8 (diff)
downloadQt-5203626e26d9635ff82b5838fcd2b811361ffc0c.zip
Qt-5203626e26d9635ff82b5838fcd2b811361ffc0c.tar.gz
Qt-5203626e26d9635ff82b5838fcd2b811361ffc0c.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed parsing of svg paths.
Diffstat (limited to 'src')
-rw-r--r--src/svg/qsvghandler.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index b2619bf..ac220bd 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -1578,8 +1578,8 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path)
count--;
break;
}
- x = x0 = num[0] + offsetX;
- y = y0 = num[1] + offsetY;
+ x = num[0] + offsetX;
+ y = num[1] + offsetY;
num += 2;
count -= 2;
path.lineTo(x, y);
@@ -1592,8 +1592,8 @@ static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path)
count--;
break;
}
- x = x0 = num[0];
- y = y0 = num[1];
+ x = num[0];
+ y = num[1];
num += 2;
count -= 2;
path.lineTo(x, y);