diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-04-24 10:26:26 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-04-24 10:26:26 (GMT) |
commit | ed3b35cff7ed7663971665e67d3a4037da8bd158 (patch) | |
tree | 74c08f6edcc96566e2fb4ddf75ad5c4e7572d028 /src/gui/painting/qpaintengine_raster.cpp | |
parent | 3ab7dc5d764d41bf828dd76672ca2918b004bad3 (diff) | |
parent | 10fa7986020c75da0ce68ec051a1086bd6bf5bf4 (diff) | |
download | Qt-ed3b35cff7ed7663971665e67d3a4037da8bd158.zip Qt-ed3b35cff7ed7663971665e67d3a4037da8bd158.tar.gz Qt-ed3b35cff7ed7663971665e67d3a4037da8bd158.tar.bz2 |
Merge branch '4.5'
Conflicts (version number change in 4.5):
src/corelib/global/qglobal.h
src/qbase.pri
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'src/gui/painting/qpaintengine_raster.cpp')
-rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index d2b1ed7..295abc5 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -4409,6 +4409,9 @@ void QClipData::fixup() */ void QClipData::setClipRect(const QRect &rect) { + if (rect == clipRect) + return; + // qDebug() << "setClipRect" << clipSpanHeight << count << allocated << rect; hasRectClip = true; clipRect = rect; @@ -4418,6 +4421,11 @@ void QClipData::setClipRect(const QRect &rect) ymin = qMin(rect.y(), clipSpanHeight); ymax = qMin(rect.y() + rect.height(), clipSpanHeight); + if (m_spans) { + delete m_spans; + m_spans = 0; + } + // qDebug() << xmin << xmax << ymin << ymax; } @@ -4441,6 +4449,12 @@ void QClipData::setClipRegion(const QRegion ®ion) ymin = rect.y(); ymax = rect.y() + rect.height(); } + + if (m_spans) { + delete m_spans; + m_spans = 0; + } + } /*! |