Commit 557c5959 authored by Kenichi Handa's avatar Kenichi Handa Committed by Lars Ingebrigtsen
Browse files

Fix problem with certain fonts in ftfont_shape_by_flt

* src/ftfont.c (ftfont_shape_by_flt): Fix problem with unusual OTF
tables in fonts (bug#49066).
parent 3dd87631
Pipeline #11494 failed with stages
in 51 seconds
......@@ -2798,10 +2798,31 @@ ftfont_shape_by_flt (Lisp_Object lgstring, struct font *font,
if (gstring.used > LGSTRING_GLYPH_LEN (lgstring))
return Qnil;
/* mflt_run may fail to set g->g.to (which must be a valid index
into lgstring) correctly if the font has an OTF table that is
different from what the m17n library expects. */
for (i = 0; i < gstring.used; i++)
{
MFLTGlyphFT *g = (MFLTGlyphFT *) (gstring.glyphs) + i;
if (g->g.to >= len)
{
/* Invalid g->g.to. */
g->g.to = len - 1;
int from = g->g.from;
/* Fix remaining glyphs. */
for (++i; i < gstring.used; i++)
{
g = (MFLTGlyphFT *) (gstring.glyphs) + i;
g->g.from = from;
g->g.to = len - 1;
}
}
}
for (i = 0; i < gstring.used; i++)
{
MFLTGlyphFT *g = (MFLTGlyphFT *) (gstring.glyphs) + i;
g->g.from = LGLYPH_FROM (LGSTRING_GLYPH (lgstring, g->g.from));
g->g.to = LGLYPH_TO (LGSTRING_GLYPH (lgstring, g->g.to));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment