AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support all QImage formats in native pixmap conversion

Browse Source 
The conversion fallback did not catch all the more recently added
QImage formats, leading to corrupt pixmaps or crashes. Also alpha
channels were needlessly thrown away if present.

Change-Id: I38588035aa9bf37b77398489981df65201cf0340
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Eirik Aavitsland 2017-05-18 15:21:16 +02:00
parent 4f515815ef
commit 8ba373361d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp
View File

@ -529,8 +529,11 @@ void QX11PlatformPixmap::fromImage(const QImage &img, Qt::ImageConversionFlags f
}
}
if (d == 1 || d == 16 || d == 24 || image.format() == QImage::Format_Grayscale8) {
image = image.convertToFormat(QImage::Format_RGB32, flags);
if (d == 1 || image.format() > QImage::Format_ARGB32_Premultiplied) {
QImage::Format fmt = QImage::Format_RGB32;
if (alphaCheck.hasXRenderAndAlpha() && d > 1)
fmt = QImage::Format_ARGB32_Premultiplied;
image = image.convertToFormat(fmt, flags);
fromImage(image, Qt::AutoColor);
return;
}