From 833341e301bf5ffc786e42a3c4be2ec25dbd8115 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 9 Nov 2015 14:00:22 +0100 Subject: [PATCH] Detect alpha8 as having alpha-pixels Change-Id: I09025da7e3df84b6092295ec1a02698bd7b24bed Reviewed-by: Gunnar Sletta --- src/gui/image/qimage.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index b3d8563614c..01cacad6304 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -192,7 +192,9 @@ bool QImageData::checkForAlphaPixels() const case QImage::Format_Indexed8: has_alpha_pixels = has_alpha_clut; break; - + case QImage::Format_Alpha8: + has_alpha_pixels = true; + break; case QImage::Format_ARGB32: case QImage::Format_ARGB32_Premultiplied: { uchar *bits = data; @@ -266,7 +268,20 @@ bool QImageData::checkForAlphaPixels() const } } break; - default: + case QImage::Format_RGB32: + case QImage::Format_RGB16: + case QImage::Format_RGB444: + case QImage::Format_RGB555: + case QImage::Format_RGB666: + case QImage::Format_RGB888: + case QImage::Format_RGBX8888: + case QImage::Format_BGR30: + case QImage::Format_RGB30: + case QImage::Format_Grayscale8: + break; + case QImage::Format_Invalid: + case QImage::NImageFormats: + Q_UNREACHABLE(); break; }