diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-01-18 09:45:56 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-01-18 09:47:48 (GMT) |
| commit | 68153ffc1ee0dcd779a4f809b614b05550a2acf9 (patch) | |
| tree | 9d04f80e1f67e4d75e40e1e8b598044311b411f7 /src/gui/image | |
| parent | 6768bff07a75405b880fb2c2c1f2dc6ad698c44b (diff) | |
| download | Qt-68153ffc1ee0dcd779a4f809b614b05550a2acf9.zip Qt-68153ffc1ee0dcd779a4f809b614b05550a2acf9.tar.gz Qt-68153ffc1ee0dcd779a4f809b614b05550a2acf9.tar.bz2 | |
Fixed QBlittablePixmapData::fill
and a clipping error in the paintengine. Should prob. refactor engine
state and clip calls.
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qpixmap_blitter.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/image/qpixmap_blitter.cpp b/src/gui/image/qpixmap_blitter.cpp index 5ce7fc1..175c234 100644 --- a/src/gui/image/qpixmap_blitter.cpp +++ b/src/gui/image/qpixmap_blitter.cpp @@ -77,9 +77,10 @@ int QBlittablePixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const void QBlittablePixmapData::fill(const QColor &color) { - if (color.alpha() == 255 && blittable()->capabilities() & QBlittable::SolidRectCapability) - blittable()->fillRect(QRectF(0,0,w,h),color); - else + if (color.alpha() == 255 && blittable()->capabilities() & QBlittable::SolidRectCapability) { + blittable()->unlock(); + blittable()->fillRect(QRectF(0,0,w,h),color); + }else blittable()->lock()->fill(color.rgba()); } |