diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-05-18 08:57:20 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-05-18 08:57:20 (GMT) |
| commit | 16af450c02b402fb8aea59ad058c96a13d8cbe8d (patch) | |
| tree | 6a85074dde6acee1504a5286a99565621724e654 | |
| parent | 8dfb09c26d228388fba5318b6f61b4edbf67cdc2 (diff) | |
| parent | 97d0f8f43db98e1c5ae49bd32dfc027e6d3a1349 (diff) | |
| download | Qt-16af450c02b402fb8aea59ad058c96a13d8cbe8d.zip Qt-16af450c02b402fb8aea59ad058c96a13d8cbe8d.tar.gz Qt-16af450c02b402fb8aea59ad058c96a13d8cbe8d.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
| -rw-r--r-- | src/gui/painting/qtransform.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 2383272..cec2d16 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -1355,7 +1355,8 @@ static inline QHomogeneousCoordinate mapHomogeneous(const QTransform &transform, return c; } -static inline bool lineTo_clipped(QPainterPath &path, const QTransform &transform, const QPointF &a, const QPointF &b, bool needsMoveTo) +static inline bool lineTo_clipped(QPainterPath &path, const QTransform &transform, const QPointF &a, const QPointF &b, + bool needsMoveTo, bool needsLineTo = true) { QHomogeneousCoordinate ha = mapHomogeneous(transform, a); QHomogeneousCoordinate hb = mapHomogeneous(transform, b); @@ -1388,7 +1389,8 @@ static inline bool lineTo_clipped(QPainterPath &path, const QTransform &transfor if (needsMoveTo) path.moveTo(ha.toPoint()); - path.lineTo(hb.toPoint()); + if (needsLineTo) + path.lineTo(hb.toPoint()); return true; } @@ -1455,7 +1457,7 @@ static QPainterPath mapProjective(const QTransform &transform, const QPainterPat } if (path.elementCount() > 0 && lastMoveTo != last) - lineTo_clipped(result, transform, last, lastMoveTo, needsMoveTo); + lineTo_clipped(result, transform, last, lastMoveTo, needsMoveTo, false); return result; } |