diff options
| author | aavit <qt-info@nokia.com> | 2010-05-14 07:06:54 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-05-14 07:06:54 (GMT) |
| commit | b2e15281d56415e6ef8d4f1604d25b198d449f06 (patch) | |
| tree | f6207fd8c402b938fd20e098327f50ccb1ffc8e6 /src/gui/painting/qrasterizer.cpp | |
| parent | ad6dafee9be288bcef6b2c4b318b234d2995abff (diff) | |
| parent | b7f4b58a94f3be8f8c2fa2f2e4acc3a05e621e92 (diff) | |
| download | Qt-b2e15281d56415e6ef8d4f1604d25b198d449f06.zip Qt-b2e15281d56415e6ef8d4f1604d25b198d449f06.tar.gz Qt-b2e15281d56415e6ef8d4f1604d25b198d449f06.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/painting/qrasterizer.cpp')
| -rw-r--r-- | src/gui/painting/qrasterizer.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gui/painting/qrasterizer.cpp b/src/gui/painting/qrasterizer.cpp index 51d01c9..f8f8afb 100644 --- a/src/gui/painting/qrasterizer.cpp +++ b/src/gui/painting/qrasterizer.cpp @@ -198,9 +198,11 @@ public: }; QScanConverter::QScanConverter() - : m_alloc(0) + : m_lines(0) + , m_alloc(0) , m_size(0) , m_intersections(0) + , m_active(0) { } @@ -310,6 +312,10 @@ struct QBoolToType template <typename T> void qScanConvert(QScanConverter &d, T allVertical) { + if (!d.m_lines.size()) { + d.m_active.reset(); + return; + } qSort(d.m_lines.data(), d.m_lines.data() + d.m_lines.size(), QT_PREPEND_NAMESPACE(topOrder)); int line = 0; for (int y = d.m_lines.first().top; y <= d.m_bottom; ++y) { |