whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix QPixelFormat values 

The two mono formats are actually indexed and may have both color and
alpha values in the color-table, and Format_ARGB4444_Premultiplied and
Format_ARGB6666_Premultiplied both have the alpha value in the end.

Change-Id: I7f1efb2213710f5eb628d71356f9c8ed75b50f4d
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
bb10
Allan Sandfeld Jensen 2014-09-19 16:06:21 +02:00
parent 44a381087e
commit 91b7d53154
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4662,7 +4662,7 @@ static Q_CONSTEXPR QPixelFormat pixelformats[] = {
//QImage::Format_Invalid:
QPixelFormat(),
//QImage::Format_Mono:
QPixelFormat(QPixelFormat::Grayscale,
QPixelFormat(QPixelFormat::Indexed,
/*RED*/ 1,
/*GREEN*/ 0,
/*BLUE*/ 0,
@ -4675,7 +4675,7 @@ static Q_CONSTEXPR QPixelFormat pixelformats[] = {
/*INTERPRETATION*/ QPixelFormat::UnsignedByte,
/*BYTE ORDER*/ QPixelFormat::CurrentSystemEndian),
//QImage::Format_MonoLSB:
QPixelFormat(QPixelFormat::Grayscale,
QPixelFormat(QPixelFormat::Indexed,
/*RED*/ 1,
/*GREEN*/ 0,
/*BLUE*/ 0,
@ -4787,7 +4787,7 @@ static Q_CONSTEXPR QPixelFormat pixelformats[] = {
/*FIFTH*/ 0,
/*ALPHA*/ 6,
/*ALPHA USAGE*/ QPixelFormat::UsesAlpha,
/*ALPHA POSITION*/ QPixelFormat::AtBeginning,
/*ALPHA POSITION*/ QPixelFormat::AtEnd,
/*PREMULTIPLIED*/ QPixelFormat::Premultiplied,
/*INTERPRETATION*/ QPixelFormat::UnsignedInteger,
/*BYTE ORDER*/ QPixelFormat::CurrentSystemEndian),
@ -4852,7 +4852,7 @@ static Q_CONSTEXPR QPixelFormat pixelformats[] = {
/*FIFTH*/ 0,
/*ALPHA*/ 4,
/*ALPHA USAGE*/ QPixelFormat::UsesAlpha,
/*ALPHA POSITION*/ QPixelFormat::AtBeginning,
/*ALPHA POSITION*/ QPixelFormat::AtEnd,
/*PREMULTIPLIED*/ QPixelFormat::Premultiplied,
/*INTERPRETATION*/ QPixelFormat::UnsignedShort,
/*BYTE ORDER*/ QPixelFormat::CurrentSystemEndian),