diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-11-10 06:39:00 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-11-10 06:39:00 (GMT) |
| commit | 432d54d092414431e1e54daa2259384d83600bf2 (patch) | |
| tree | 0ec7c9080b5dcdae1f411457f8b057145ef94366 /src/gui/image/qimage.cpp | |
| parent | c411c39557d31b94efb5813be9e9ef43c05a9093 (diff) | |
| parent | 4459e18afd3e537c2155dadad0937e0a5cdd76c5 (diff) | |
| download | Qt-432d54d092414431e1e54daa2259384d83600bf2.zip Qt-432d54d092414431e1e54daa2259384d83600bf2.tar.gz Qt-432d54d092414431e1e54daa2259384d83600bf2.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/image/qimage.cpp')
| -rw-r--r-- | src/gui/image/qimage.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 571ef9d..21ca1e3 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -4083,7 +4083,8 @@ QImage QImage::createAlphaMask(Qt::ImageConversionFlags flags) const } QImage mask(d->width, d->height, Format_MonoLSB); - dither_to_Mono(mask.d, d, flags, true); + if (!mask.isNull()) + dither_to_Mono(mask.d, d, flags, true); return mask; } |