diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2010-02-10 12:11:01 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-02-10 12:45:12 (GMT) |
| commit | 4e1dfb456a62feea7d1747328356cb6e39109bb7 (patch) | |
| tree | 4d30e9c11605894fe957acb253c3228e15ead141 | |
| parent | 0fe100ddd40580f7295611628b319768fa4883d7 (diff) | |
| download | Qt-4e1dfb456a62feea7d1747328356cb6e39109bb7.zip Qt-4e1dfb456a62feea7d1747328356cb6e39109bb7.tar.gz Qt-4e1dfb456a62feea7d1747328356cb6e39109bb7.tar.bz2 | |
Prevented assert when using drop shadow effect in the GL 2 engine.
The GL 2 pixmap filter uses Indexed8 images in the drop shadow case.
Reviewed-by: Tom Cooksey
(cherry picked from commit f04f014835e9fd4c41e9113e8036ba71ff884ae9)
| -rw-r--r-- | src/gui/image/qpixmapfilter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/image/qpixmapfilter.cpp index 05e02b8..0d9cba4 100644 --- a/src/gui/image/qpixmapfilter.cpp +++ b/src/gui/image/qpixmapfilter.cpp @@ -710,7 +710,8 @@ void expblur(QImage &img, qreal radius, bool improvedQuality = false, int transp radius *= qreal(0.5); Q_ASSERT(img.format() == QImage::Format_ARGB32_Premultiplied - || img.format() == QImage::Format_RGB32); + || img.format() == QImage::Format_RGB32 + || img.format() == QImage::Format_Indexed8); // choose the alpha such that pixels at radius distance from a fully // saturated pixel will have an alpha component of no greater than |