1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Detect alpha8 as having alpha-pixels

Browse Source 
Change-Id: I09025da7e3df84b6092295ec1a02698bd7b24bed
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
This commit is contained in:
Allan Sandfeld Jensen 2015-11-09 14:00:22 +01:00
parent c83eefff97
commit 833341e301
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/image/qimage.cpp
View File

@ -192,7 +192,9 @@ bool QImageData::checkForAlphaPixels() const
case QImage::Format_Indexed8: case QImage::Format_Indexed8:
has_alpha_pixels = has_alpha_clut; has_alpha_pixels = has_alpha_clut;
break; break;
case QImage::Format_Alpha8:
has_alpha_pixels = true;
break;
case QImage::Format_ARGB32: case QImage::Format_ARGB32:
case QImage::Format_ARGB32_Premultiplied: { case QImage::Format_ARGB32_Premultiplied: {
uchar *bits = data; uchar *bits = data;
@ -266,7 +268,20 @@ bool QImageData::checkForAlphaPixels() const
} }
} break; } 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; break;
} }