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

[gsub] Minor shuffling

This commit is contained in:
Behdad Esfahbod 2014-06-05 18:54:44 -04:00
parent b6b304f12b
commit aae69451df
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/hb-ot-layout-gsub-table.hh
View File

@ -270,6 +270,7 @@ struct Sequence
inline bool apply (hb_apply_context_t *c) const inline bool apply (hb_apply_context_t *c) const
{ {
TRACE_APPLY (this); TRACE_APPLY (this);
unsigned int count = substitute.len;
/* TODO: /* TODO:
* Testing shows that Uniscribe actually allows zero-len susbstitute, * Testing shows that Uniscribe actually allows zero-len susbstitute,
@ -279,23 +280,24 @@ struct Sequence
* buffer->move_to() makes assumptions about this too. Perhaps fix * buffer->move_to() makes assumptions about this too. Perhaps fix
* in the future after figuring out what to do with the clusters. * in the future after figuring out what to do with the clusters.
*/ */
if (unlikely (!substitute.len)) return TRACE_RETURN (false); if (unlikely (!count)) return TRACE_RETURN (false);
/* Special-case to make it in-place and not consider this
* as a "multiplied" substitution. */
if (unlikely (count == 1))
{
c->replace_glyph (substitute.array[0]);
return TRACE_RETURN (true);
}
unsigned int klass = _hb_glyph_info_is_ligature (&c->buffer->cur()) ? unsigned int klass = _hb_glyph_info_is_ligature (&c->buffer->cur()) ?
HB_OT_LAYOUT_GLYPH_PROPS_BASE_GLYPH : 0; HB_OT_LAYOUT_GLYPH_PROPS_BASE_GLYPH : 0;
unsigned int count = substitute.len;
if (count == 1) /* Special-case to make it in-place. */ for (unsigned int i = 0; i < count; i++) {
{ _hb_glyph_info_set_lig_props_for_component (&c->buffer->cur(), i);
c->replace_glyph (substitute.array[0]); c->output_glyph (substitute.array[i], klass);
}
else
{
for (unsigned int i = 0; i < count; i++) {
_hb_glyph_info_set_lig_props_for_component (&c->buffer->cur(), i);
c->output_glyph (substitute.array[i], klass);
}
c->buffer->skip_glyph ();
} }
c->buffer->skip_glyph ();
return TRACE_RETURN (true); return TRACE_RETURN (true);
} }
@ -633,7 +635,8 @@ struct Ligature
{ {
TRACE_APPLY (this); TRACE_APPLY (this);
unsigned int count = component.len; unsigned int count = component.len;
if (unlikely (count < 1)) return TRACE_RETURN (false);
if (unlikely (!count)) return TRACE_RETURN (false);
bool is_mark_ligature = false; bool is_mark_ligature = false;
unsigned int total_component_count = 0; unsigned int total_component_count = 0;