LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-12 08:30:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2277 from sarodz/issue-1990

Browse Source 
Fix buffer range merging in HarfbuzzShaper to check cluster contiguity

Fixes #1990
This commit is contained in:
Sasha Szpakowski
2026-04-16 23:25:37 -03:00
committed by GitHub
parent 453752d405 281cc42723
commit ef13719aeb
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/font/freetype/HarfbuzzShaper.cpp
+21 -6
View File
@@ -163,21 +163,36 @@ void HarfbuzzShaper::computeBufferRanges(const ColoredCodepoints &codepoints, Ra
for (size_t i = 0; i < glyphcount; i++)
{
uint32 prevCluster = (i > 0) ? glyphinfos[i - 1].cluster : 0;
uint32 currCluster = glyphinfos[i].cluster;
// Only merge consecutive glyphs if their clusters are also consecutive
bool clustersContiguous = (i == 0) || (currCluster == prevCluster + 1) || (currCluster == prevCluster);
if (isValidGlyph(glyphinfos[i].codepoint, codepoints.cps, glyphinfos[i].cluster))
{
if (bufferranges.empty() || bufferranges.back().index != rasti || bufferranges.back().range.getMax() + 1 != i)
bufferranges.push_back({rasti, (int)glyphinfos[i].cluster, Range(i, 1)});
else
bool canExtendPrevious = !bufferranges.empty()
&& bufferranges.back().index == rasti
&& bufferranges.back().range.getMax() + 1 == i
&& clustersContiguous;
if (canExtendPrevious)
bufferranges.back().range.last++;
else
bufferranges.push_back({rasti, (int)glyphinfos[i].cluster, Range(i, 1)});
}
else if (rasti == rasterizers.size() - 1)
{
// Use the first font for remaining invalid glyphs when no
// fallback font supports them.
if (bufferranges.empty() || bufferranges.back().index != 0 || bufferranges.back().range.getMax() + 1 != i)
bufferranges.push_back({0, (int)glyphinfos[i].cluster, Range(i, 1)});
else
bool canExtendPrevious = !bufferranges.empty()
&& bufferranges.back().index == 0
&& bufferranges.back().range.getMax() + 1 == i
&& clustersContiguous;
if (canExtendPrevious)
bufferranges.back().range.last++;
else
bufferranges.push_back({0, (int)glyphinfos[i].cluster, Range(i, 1)});
}
else
{