322f38fa5b
Beware, not built yet. - Add patch to fix text rendering on 16bit X11 surfaces (boo#1205585): * 0001-Fix-wrong-to-linear-conversion.patch OBS-URL: https://build.opensuse.org/request/show/1040598 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtbase?expand=0&rev=42
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
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
|
|
|