summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Rødal <sroedal@trolltech.com>2010-02-10 12:11:01 (GMT)
committerSamuel Rødal <sroedal@trolltech.com>2010-02-10 12:14:36 (GMT)
commitf04f014835e9fd4c41e9113e8036ba71ff884ae9 (patch)
tree492980773f914dd9c7a017f1ac2d81c3db321f81
parent64233a38fe5a1755a6426caf55eaf8abbd4187ac (diff)
downloadQt-f04f014835e9fd4c41e9113e8036ba71ff884ae9.zip
Qt-f04f014835e9fd4c41e9113e8036ba71ff884ae9.tar.gz
Qt-f04f014835e9fd4c41e9113e8036ba71ff884ae9.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
-rw-r--r--src/gui/image/qpixmapfilter.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/image/qpixmapfilter.cpp
index 7cf942c..2792e45 100644
--- a/src/gui/image/qpixmapfilter.cpp
+++ b/src/gui/image/qpixmapfilter.cpp
@@ -713,7 +713,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