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

[OTLayout] Port apply_lookup to skippy_iter

This commit is contained in:
Behdad Esfahbod 2013-02-14 07:41:03 -05:00
parent dfca269f06
commit 8820bb235b
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/hb-ot-layout-gsubgpos-private.hh
View File

@ -839,19 +839,35 @@ static inline bool apply_lookup (hb_apply_context_t *c,
* and we jump out of it. Not entirely disastrous. So we don't check * and we jump out of it. Not entirely disastrous. So we don't check
* for reverse lookup here. * for reverse lookup here.
*/ */
for (unsigned int i = 0; i < count; /* NOP */) unsigned int i = 0;
if (lookupCount && 0 == lookupRecord->sequenceIndex)
{ {
if (unlikely (c->buffer->idx == end)) unsigned int old_pos = c->buffer->idx;
return TRACE_RETURN (true);
if (i) /* Apply a lookup */
while (c->should_skip_current_glyph ()) bool done = c->recurse (lookupRecord->lookupListIndex);
lookupRecord++;
lookupCount--;
/* Err, this is wrong if the lookup jumped over some glyphs */
i += c->buffer->idx - old_pos;
if (!done)
goto not_applied;
}
else
{ {
not_applied:
/* No lookup applied for this index */ /* No lookup applied for this index */
c->buffer->next_glyph (); c->buffer->next_glyph ();
if (unlikely (c->buffer->idx == end)) i++;
return TRACE_RETURN (true);
} }
hb_apply_context_t::skipping_forward_iterator_t skippy_iter (c, c->buffer->idx - 1, count - i);
while (i < count)
{
if (!skippy_iter.next ()) return TRACE_RETURN (true);
while (c->buffer->idx < skippy_iter.idx)
c->buffer->next_glyph ();
if (lookupCount && i == lookupRecord->sequenceIndex) if (lookupCount && i == lookupRecord->sequenceIndex)
{ {
@ -864,15 +880,19 @@ static inline bool apply_lookup (hb_apply_context_t *c,
lookupCount--; lookupCount--;
/* Err, this is wrong if the lookup jumped over some glyphs */ /* Err, this is wrong if the lookup jumped over some glyphs */
i += c->buffer->idx - old_pos; i += c->buffer->idx - old_pos;
if (unlikely (c->buffer->idx == end))
return TRACE_RETURN (true);
if (!done) if (!done)
goto not_applied; goto not_applied2;
else
{
/* Reinitialize iterator. */
hb_apply_context_t::skipping_forward_iterator_t tmp (c, c->buffer->idx - 1, count - i);
skippy_iter = tmp;
}
} }
else else
{ {
not_applied: not_applied2:
/* No lookup applied for this index */ /* No lookup applied for this index */
c->buffer->next_glyph (); c->buffer->next_glyph ();
i++; i++;