summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2023-11-09 12:06:49 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2023-11-09 18:17:33 +0100
commitb637607789a9e92a0dd0ff7fb31b9a92a10ef0bf (patch)
tree1ae7cd18ba3d5b26ad1d13365c90345913aecc78
parent9ee30b1dc2f7a6a4d470a35fb250769f12e03ad9 (diff)
Fix findNearestColor for semitransparent colors
The two destcolors and the buffer are all already premultiplied. This would double premultiply them. Pick-to: 6.6 6.5 6.2 Change-Id: I235bee616d8e0033b87c6f96464f0926af7bd29a Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
-rw-r--r--src/gui/painting/qdrawhelper.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index 117f43db8f..7029a0e0a3 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -513,9 +513,8 @@ static DestFetchProcFP destFetchProcFP[QImage::NImageFormats] =
*/
static inline QRgb findNearestColor(QRgb color, QRasterBuffer *rbuf)
{
- QRgb color_0 = qPremultiply(rbuf->destColor0);
- QRgb color_1 = qPremultiply(rbuf->destColor1);
- color = qPremultiply(color);
+ const QRgb color_0 = rbuf->destColor0;
+ const QRgb color_1 = rbuf->destColor1;
int r = qRed(color);
int g = qGreen(color);