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

[subset/layout] Rename dispatch_closure_lookups_recurse_func to dispatch_recurse_func<>

This commit is contained in:
Behdad Esfahbod 2022-06-08 06:34:48 -06:00
parent c13ff39520
commit 4119f73c21
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/OT/Layout/GSUB/SubstLookup.hh
View File

@ -73,8 +73,6 @@ struct SubstLookup : Lookup
return hb_closure_lookups_context_t::default_return_value (); return hb_closure_lookups_context_t::default_return_value ();
} }
c->set_recurse_func (dispatch_closure_lookups_recurse_func);
hb_closure_lookups_context_t::return_t ret = dispatch (c); hb_closure_lookups_context_t::return_t ret = dispatch (c);
return ret; return ret;
} }
@ -204,8 +202,6 @@ struct SubstLookup : Lookup
return ret; return ret;
} }
HB_INTERNAL static hb_closure_lookups_context_t::return_t dispatch_closure_lookups_recurse_func (hb_closure_lookups_context_t *c, unsigned lookup_index);
template <typename context_t, typename ...Ts> template <typename context_t, typename ...Ts>
typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
{ return Lookup::dispatch<SubTable> (c, std::forward<Ts> (ds)...); } { return Lookup::dispatch<SubTable> (c, std::forward<Ts> (ds)...); }

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

@ -2918,7 +2918,6 @@ struct PosLookup : Lookup
c->set_lookup_inactive (this_index); c->set_lookup_inactive (this_index);
return hb_closure_lookups_context_t::default_return_value (); return hb_closure_lookups_context_t::default_return_value ();
} }
c->set_recurse_func (dispatch_closure_lookups_recurse_func);
hb_closure_lookups_context_t::return_t ret = dispatch (c); hb_closure_lookups_context_t::return_t ret = dispatch (c);
return ret; return ret;
@ -2934,8 +2933,6 @@ struct PosLookup : Lookup
template <typename context_t> template <typename context_t>
static typename context_t::return_t dispatch_recurse_func (context_t *c, unsigned int lookup_index); static typename context_t::return_t dispatch_recurse_func (context_t *c, unsigned int lookup_index);
HB_INTERNAL static hb_closure_lookups_context_t::return_t dispatch_closure_lookups_recurse_func (hb_closure_lookups_context_t *c, unsigned this_index);
template <typename context_t, typename ...Ts> template <typename context_t, typename ...Ts>
typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
{ return Lookup::dispatch<SubTable> (c, std::forward<Ts> (ds)...); } { return Lookup::dispatch<SubTable> (c, std::forward<Ts> (ds)...); }
@ -3120,7 +3117,9 @@ template <typename context_t>
return l.dispatch (c); return l.dispatch (c);
} }
/*static*/ inline hb_closure_lookups_context_t::return_t PosLookup::dispatch_closure_lookups_recurse_func (hb_closure_lookups_context_t *c, unsigned this_index) template <>
inline hb_closure_lookups_context_t::return_t
PosLookup::dispatch_recurse_func<hb_closure_lookups_context_t> (hb_closure_lookups_context_t *c, unsigned this_index)
{ {
const PosLookup &l = c->face->table.GPOS.get_relaxed ()->table->get_lookup (this_index); const PosLookup &l = c->face->table.GPOS.get_relaxed ()->table->get_lookup (this_index);
return l.closure_lookups (c, this_index); return l.closure_lookups (c, this_index);

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

@ -59,7 +59,9 @@ template <typename context_t>
return l.dispatch (c); return l.dispatch (c);
} }
/*static*/ inline hb_closure_lookups_context_t::return_t SubstLookup::dispatch_closure_lookups_recurse_func (hb_closure_lookups_context_t *c, unsigned this_index) template <>
inline hb_closure_lookups_context_t::return_t
SubstLookup::dispatch_recurse_func<hb_closure_lookups_context_t> (hb_closure_lookups_context_t *c, unsigned this_index)
{ {
const SubstLookup &l = c->face->table.GSUB.get_relaxed ()->table->get_lookup (this_index); const SubstLookup &l = c->face->table.GSUB.get_relaxed ()->table->get_lookup (this_index);
return l.closure_lookups (c, this_index); return l.closure_lookups (c, this_index);

2
src/hb-ot-layout-gsubgpos.hh
View File

@ -3948,6 +3948,8 @@ struct GSUBGPOS
hb_set_t visited_lookups, inactive_lookups; hb_set_t visited_lookups, inactive_lookups;
OT::hb_closure_lookups_context_t c (face, glyphs, &visited_lookups, &inactive_lookups); OT::hb_closure_lookups_context_t c (face, glyphs, &visited_lookups, &inactive_lookups);
c.set_recurse_func (TLookup::template dispatch_recurse_func<hb_closure_lookups_context_t>);
for (unsigned lookup_index : + hb_iter (lookup_indexes)) for (unsigned lookup_index : + hb_iter (lookup_indexes))
reinterpret_cast<const TLookup &> (get_lookup (lookup_index)).closure_lookups (&c, lookup_index); reinterpret_cast<const TLookup &> (get_lookup (lookup_index)).closure_lookups (&c, lookup_index);