rpm/libqt5-qtbase
SHA256
1
0
Fork 0
forked from pool/libqt5-qtbase
Code Pull Requests Activity

Accepting request 1040763 from KDE:Qt:5.15

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1040763
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=135
This commit is contained in:
Dominique Leuenberger 2022-12-07 16:34:09 +00:00 committed by Git OBS Bridge
commit 9702c03808
3 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
0001-Fix-wrong-to-linear-conversion.patch Normal file
View File

@ -0,0 +1,44 @@
From e97a4f42b78259da9422b12d1a601d6c8dd93f68 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 6 Dec 2022 10:42:59 +0100
Subject: [PATCH] Fix wrong to linear conversion
Causing bad rendering of gamma corrected text on non-standard image
format paint devices.
Pick-to: 6.4 6.2 5.15
Fixes: QTBUG-109169
Change-Id: I6d95e9a42b9ccac609071123dd4535d25e225a29
---
src/gui/painting/qcolortrclut_p.h | 1 +
src/gui/painting/qdrawhelper.cpp | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gui/painting/qcolortrclut_p.h b/src/gui/painting/qcolortrclut_p.h
index 76a6a60803..24fd522e6c 100644
--- a/src/gui/painting/qcolortrclut_p.h
+++ b/src/gui/painting/qcolortrclut_p.h
@@ -118,6 +118,7 @@ public:
return QRgba64::fromRgba64(r, g, b, qAlpha(rgb32) * 257);
#endif
}
+ QRgba64 toLinear64(QRgba64) const = delete;
QRgb toLinear(QRgb rgb32) const
{
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index a61793508a..5ba2d277b7 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -6091,7 +6091,7 @@ static inline void alphargbblend_argb32(quint32 *dst, uint coverage, const QRgba
static inline void rgbBlendPixel(QRgba64 &dst, int coverage, QRgba64 slinear, const QColorTrcLut *colorProfile)
{
// Do a gammacorrected RGB alphablend...
- const QRgba64 dlinear = colorProfile ? colorProfile->toLinear64(dst) : dst;
+ const QRgba64 dlinear = colorProfile ? colorProfile->toLinear(dst) : dst;
QRgba64 blend = rgbBlend(dlinear, slinear, coverage);
--
2.38.1

6
libqt5-qtbase.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 6 10:37:08 UTC 2022 - Fabian Vogt <fvogt@suse.com>
- Add patch to fix text rendering on 16bit X11 surfaces (boo#1205585):
* 0001-Fix-wrong-to-linear-conversion.patch
-------------------------------------------------------------------
Thu Nov 3 08:50:33 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>

2
libqt5-qtbase.spec
View File

@ -61,6 +61,8 @@ Patch12: 0001-Add-remote-print-queue-support.patch
Patch21: 0001-Don-t-white-list-recent-Mesa-versions-for-multithrea.patch
Patch24: fix-fixqt4headers.patch
# patches 1000-2000 and above from upstream 5.15 branch #
# Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/447019
Patch1001: 0001-Fix-wrong-to-linear-conversion.patch
# patches 2000-3000 and above from upstream qt6/dev branch #
# Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/255384
Patch2001: 0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch