organicmaps/harfbuzz
13
Fork 0
mirror of https://github.com/harfbuzz/harfbuzz.git synced 2025-04-05 21:45:06 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 7

Revert "[subset/closure] Batch recursions in scheduled stages"

Browse source 
This reverts commit f2aaeeb301.
This commit is contained in:
Behdad Esfahbod 2023-07-14 11:26:51 -06:00
parent 5e42f7bb6d
commit d00b88737e
2 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/hb-ot-layout-gsub-table.hh
View file

@ -53,14 +53,9 @@ template <typename context_t>
/*static*/ typename hb_closure_context_t::return_t SubstLookup::closure_glyphs_recurse_func (hb_closure_context_t *c, unsigned lookup_index, hb_set_t *covered_seq_indices, unsigned seq_index, unsigned end_index)
{
const SubstLookup &l = c->face->table.GSUB.get_relaxed ()->table->get_lookup (lookup_index);
if (covered_seq_indices && l.may_have_non_1to1 ())
if (l.may_have_non_1to1 ())
hb_set_add_range (covered_seq_indices, seq_index, end_index);
if (covered_seq_indices)
c->schedule (lookup_index);
else
l.dispatch (c);
return hb_empty_t ();
return l.dispatch (c);
}
template <>

15
src/hb-ot-layout-gsubgpos.hh
View file

@ -183,22 +183,8 @@ struct hb_closure_context_t :
void set_recurse_func (recurse_func_t func) { recurse_func = func; }
void schedule (unsigned lookup_index)
{
scheduled.add (lookup_index);
}
void flush ()
{
hb_set_t scheduled_copy;
while (scheduled)
{
scheduled_copy = scheduled;
scheduled.clear ();
for (unsigned lookup_index : scheduled_copy)
recurse (lookup_index, nullptr, 0, 0);
}
output->del_range (face->get_num_glyphs (), HB_SET_VALUE_INVALID); /* Remove invalid glyphs. */
glyphs->union_ (*output);
output->clear ();
@ -210,7 +196,6 @@ struct hb_closure_context_t :
hb_map_t *done_lookups_glyph_count;
hb_hashmap_t<unsigned, hb::unique_ptr<hb_set_t>> *done_lookups_glyph_set;
unsigned int lookup_count = 0;
hb_set_t scheduled;
};