[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/qt5
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Dec 18 14:55:37 UTC 2018
vcl/qt5/Qt5Bitmap.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 80cd503d4a24e7e5407181b57c3968a679ae9bab
Author: Aleksei Nikiforov <darktemplar at basealt.ru>
AuthorDate: Mon Dec 17 15:31:16 2018 +0300
Commit: Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Tue Dec 18 15:55:14 2018 +0100
Qt5: fix color bits interpretation for 32bit ARGB image formats
Change-Id: Iea8547089a0ce2dc9f6a06b84552f4261fbfa0f1
Reviewed-on: https://gerrit.libreoffice.org/65311
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
(cherry picked from commit 7802d99c35f5acfa43203f1dd6d1752af4e7c0b6)
Reviewed-on: https://gerrit.libreoffice.org/65332
Reviewed-by: Aleksei Nikiforov <darktemplar at basealt.ru>
diff --git a/vcl/qt5/Qt5Bitmap.cxx b/vcl/qt5/Qt5Bitmap.cxx
index defd0280ac24..5ccc72823adb 100644
--- a/vcl/qt5/Qt5Bitmap.cxx
+++ b/vcl/qt5/Qt5Bitmap.cxx
@@ -265,7 +265,11 @@ BitmapBuffer* Qt5Bitmap::AcquireBuffer(BitmapAccessMode /*nMode*/)
break;
case 32:
{
+#ifdef OSL_BIGENDIAN
pBuffer->mnFormat = ScanlineFormat::N32BitTcArgb | ScanlineFormat::TopDown;
+#else
+ pBuffer->mnFormat = ScanlineFormat::N32BitTcBgra | ScanlineFormat::TopDown;
+#endif
pBuffer->maPalette = aEmptyPalette;
break;
}
More information about the Libreoffice-commits
mailing list