summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-11-09 14:00:22 +0100
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-11-30 11:00:44 +0000
commit833341e301bf5ffc786e42a3c4be2ec25dbd8115 (patch)
treef45a8cae4f59915843b6f776d9869cf8ac27d112 /src
parentc83eefff976a5f2cd673f6b4a95922b13855dd29 (diff)
Detect alpha8 as having alpha-pixels
Change-Id: I09025da7e3df84b6092295ec1a02698bd7b24bed Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Diffstat (limited to 'src')
-rw-r--r--src/gui/image/qimage.cpp19
1 files changed, 17 insertions, 2 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index b3d8563614..01cacad630 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;
}