diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-11 14:18:38 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-11 14:18:38 (GMT) |
| commit | a35186a00ed789ac98c193c4ded2bab62f2a018a (patch) | |
| tree | 393311979e198e8d081c45711fb009c521c6356e /src/gui/image | |
| parent | 2acc883b3a339b716da9249a1366b08225acbd8a (diff) | |
| parent | 52a65fde8e97f1f6dc26192058fadc1d2275983a (diff) | |
| download | Qt-a35186a00ed789ac98c193c4ded2bab62f2a018a.zip Qt-a35186a00ed789ac98c193c4ded2bab62f2a018a.tar.gz Qt-a35186a00ed789ac98c193c4ded2bab62f2a018a.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui/image')
| -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 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 |