walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[GSUB] Minor

This commit is contained in:
Behdad Esfahbod 2012-07-30 00:55:15 -04:00
parent d1d69ec52e
commit 0aef425e25
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hb-ot-layout-gpos-table.hh
View File

@ -1147,19 +1147,16 @@ struct MarkLigPosFormat1
unsigned int comp_count = lig_attach.rows; unsigned int comp_count = lig_attach.rows;
if (unlikely (!comp_count)) return TRACE_RETURN (false); if (unlikely (!comp_count)) return TRACE_RETURN (false);
unsigned int comp_index;
/* We must now check whether the ligature ID of the current mark glyph /* We must now check whether the ligature ID of the current mark glyph
* is identical to the ligature ID of the found ligature. If yes, we * is identical to the ligature ID of the found ligature. If yes, we
* can directly use the component index. If not, we attach the mark * can directly use the component index. If not, we attach the mark
* glyph to the last component of the ligature. */ * glyph to the last component of the ligature. */
if (get_lig_id (c->buffer->info[j]) && unsigned int comp_index;
get_lig_id (c->buffer->info[j]) == get_lig_id (c->buffer->cur()) && unsigned int lig_id = get_lig_id (c->buffer->info[j]);
get_lig_comp (c->buffer->cur()) > 0) unsigned int mark_id = get_lig_id (c->buffer->cur());
{ unsigned int mark_comp = get_lig_comp (c->buffer->cur());
comp_index = get_lig_comp (c->buffer->cur()) - 1; if (lig_id && lig_id == mark_id && mark_comp > 0)
if (comp_index >= comp_count) comp_index = MIN (comp_count, get_lig_comp (c->buffer->cur())) - 1;
comp_index = comp_count - 1;
}
else else
comp_index = comp_count - 1; comp_index = comp_count - 1;