diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-15 17:11:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-15 17:11:11 (GMT) |
| commit | 7455ba4fdc82bc8e7174184090ddfbf03c312446 (patch) | |
| tree | 4c30852ee30c8974b2482c5525dc8046a4d0cb52 /src/gui/image | |
| parent | f95d5bde3ba66dd182802addd15dabbfa85611e1 (diff) | |
| parent | 42dda19d82ceea48f19d356cfaf2b26acb763df8 (diff) | |
| download | Qt-7455ba4fdc82bc8e7174184090ddfbf03c312446.zip Qt-7455ba4fdc82bc8e7174184090ddfbf03c312446.tar.gz Qt-7455ba4fdc82bc8e7174184090ddfbf03c312446.tar.bz2 | |
Merge remote branch 'qt/master' into staging-2-master
Conflicts:
tests/auto/qlineedit/tst_qlineedit.cpp
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 |