diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-15 07:52:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-15 07:52:46 (GMT) |
| commit | f8c0b86e7c0f31f3dee100bb349f7c89380afb44 (patch) | |
| tree | 8814b0bd8262d4f6557a58e62bf2d9cf86ba9de4 | |
| parent | 7f339416471839ca9137b9ea1aa79f74fb565f4b (diff) | |
| parent | 6d29bcc28c4ee9b7583a62d23a931b9389004966 (diff) | |
| download | Qt-f8c0b86e7c0f31f3dee100bb349f7c89380afb44.zip Qt-f8c0b86e7c0f31f3dee100bb349f7c89380afb44.tar.gz Qt-f8c0b86e7c0f31f3dee100bb349f7c89380afb44.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Avoid a crash in the OpenVG paint engine when clipping to an empty path
| -rw-r--r-- | src/openvg/qpaintengine_vg.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp index 7a050f6..7de09ce 100644 --- a/src/openvg/qpaintengine_vg.cpp +++ b/src/openvg/qpaintengine_vg.cpp @@ -1632,7 +1632,10 @@ void QVGPaintEngine::clip(const QVectorPath &path, Qt::ClipOperation op) // Try converting the path into a QRegion that tightly follows // the outline of the path we want to clip with. - QRegion region(path.convertToPainterPath().toFillPolygon(QTransform()).toPolygon()); + QRegion region; + if (!path.isEmpty()) + region = QRegion(path.convertToPainterPath().toFillPolygon(QTransform()).toPolygon()); + switch (op) { case Qt::NoClip: { |