1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: Fix arbitrary outline on emojis

Browse Source 
Emojis would sometimes get an outline in a seemingly
random color. This was because the color run is not
initialized to the first layer. MoveNext() should be
called on the initially to move it to the first layer, so
the first layer we rendered would end up being a
monochrome version of the glyph with a random palette index.

[ChangeLog][Windows] Fixed an issue where emojis would sometimes
get an outline.

Pick-to: 6.5 6.8
Fixes: QTBUG-131587
Change-Id: I42c2828d66c6149cdb62c2b6271dfd49ca002db0
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2024-11-26 10:50:35 +01:00
parent fd9c9788f7
commit 51b584e606
1 changed files with 52 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/gui/text/windows/qwindowsfontenginedirectwrite.cpp
View File

@ -893,64 +893,65 @@ QImage QWindowsFontEngineDirectWrite::imageForGlyph(glyph_t t,
image.fill(0xffffffff);
}
BOOL ok = true;
if (SUCCEEDED(hr)) {
BOOL ok = true;
while (SUCCEEDED(hr) && ok) {
const DWRITE_COLOR_GLYPH_RUN *colorGlyphRun = 0;
hr = enumerator->GetCurrentRun(&colorGlyphRun);
if (FAILED(hr)) { // No colored runs, only outline
qErrnoWarning(hr, "%s: IDWriteColorGlyphRunEnumerator::GetCurrentRun failed", __FUNCTION__);
break;
}
IDWriteGlyphRunAnalysis *colorGlyphsAnalysis = NULL;
hr = factory2->CreateGlyphRunAnalysis(
&colorGlyphRun->glyphRun,
&transform,
renderMode,
measureMode,
gridFitMode,
DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE,
0.0, 0.0,
&colorGlyphsAnalysis
);
if (FAILED(hr)) {
qErrnoWarning(hr, "%s: CreateGlyphRunAnalysis failed for color run", __FUNCTION__);
break;
}
float r, g, b, a;
if (colorGlyphRun->paletteIndex == 0xFFFF) {
r = float(color.redF());
g = float(color.greenF());
b = float(color.blueF());
a = float(color.alphaF());
} else {
r = qBound(0.0f, colorGlyphRun->runColor.r, 1.0f);
g = qBound(0.0f, colorGlyphRun->runColor.g, 1.0f);
b = qBound(0.0f, colorGlyphRun->runColor.b, 1.0f);
a = qBound(0.0f, colorGlyphRun->runColor.a, 1.0f);
}
if (!qFuzzyIsNull(a)) {
renderGlyphRun(&image,
r,
g,
b,
a,
colorGlyphsAnalysis,
boundingRect,
renderMode);
}
colorGlyphsAnalysis->Release();
hr = enumerator->MoveNext(&ok);
if (FAILED(hr)) {
qErrnoWarning(hr, "%s: IDWriteColorGlyphRunEnumerator::MoveNext failed", __FUNCTION__);
break;
}
if (ok) {
const DWRITE_COLOR_GLYPH_RUN *colorGlyphRun = 0;
hr = enumerator->GetCurrentRun(&colorGlyphRun);
if (FAILED(hr)) { // No colored runs, only outline
qErrnoWarning(hr, "%s: IDWriteColorGlyphRunEnumerator::GetCurrentRun failed", __FUNCTION__);
break;
}
IDWriteGlyphRunAnalysis *colorGlyphsAnalysis = NULL;
hr = factory2->CreateGlyphRunAnalysis(
&colorGlyphRun->glyphRun,
&transform,
renderMode,
measureMode,
gridFitMode,
DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE,
0.0, 0.0,
&colorGlyphsAnalysis
);
if (FAILED(hr)) {
qErrnoWarning(hr, "%s: CreateGlyphRunAnalysis failed for color run", __FUNCTION__);
break;
}
float r, g, b, a;
if (colorGlyphRun->paletteIndex == 0xFFFF) {
r = float(color.redF());
g = float(color.greenF());
b = float(color.blueF());
a = 1.0;
} else {
r = qBound(0.0f, colorGlyphRun->runColor.r, 1.0f);
g = qBound(0.0f, colorGlyphRun->runColor.g, 1.0f);
b = qBound(0.0f, colorGlyphRun->runColor.b, 1.0f);
a = qBound(0.0f, colorGlyphRun->runColor.a, 1.0f);
}
if (!qFuzzyIsNull(a)) {
renderGlyphRun(&image,
r,
g,
b,
a,
colorGlyphsAnalysis,
boundingRect,
renderMode);
}
colorGlyphsAnalysis->Release();
}
}
} else {
float r, g, b, a;