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

Change a few HB_INTERNAL static methods to static inline

This commit is contained in:
Behdad Esfahbod 2019-12-10 13:31:50 -06:00
parent dd3972a364
commit a061e47fcc
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,17 +173,17 @@ struct ValueFormat : HBUINT16
return true; return true;
} }
HB_INTERNAL static OffsetTo<Device>& get_device (Value* value) static inline OffsetTo<Device>& get_device (Value* value)
{ {
return *static_cast<OffsetTo<Device> *> (value); return *static_cast<OffsetTo<Device> *> (value);
} }
HB_INTERNAL static const OffsetTo<Device>& get_device (const Value* value, bool *worked=nullptr) static inline const OffsetTo<Device>& get_device (const Value* value, bool *worked=nullptr)
{ {
if (worked) *worked |= bool (*value); if (worked) *worked |= bool (*value);
return *static_cast<const OffsetTo<Device> *> (value); return *static_cast<const OffsetTo<Device> *> (value);
} }
HB_INTERNAL static const HBINT16& get_short (const Value* value, bool *worked=nullptr) static inline const HBINT16& get_short (const Value* value, bool *worked=nullptr)
{ {
if (worked) *worked |= bool (*value); if (worked) *worked |= bool (*value);
return *reinterpret_cast<const HBINT16 *> (value); return *reinterpret_cast<const HBINT16 *> (value);
@ -1892,7 +1892,7 @@ struct PosLookup : Lookup
dispatch (&c); dispatch (&c);
} }
HB_INTERNAL static bool apply_recurse_func (hb_ot_apply_context_t *c, unsigned int lookup_index); static inline bool apply_recurse_func (hb_ot_apply_context_t *c, unsigned int lookup_index);
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);
@ -2053,7 +2053,7 @@ template <typename context_t>
const PosLookup &l = c->face->table.GPOS.get_relaxed ()->table->get_lookup (lookup_index); const PosLookup &l = c->face->table.GPOS.get_relaxed ()->table->get_lookup (lookup_index);
return l.dispatch (c); return l.dispatch (c);
} }
/*static*/ inline bool PosLookup::apply_recurse_func (hb_ot_apply_context_t *c, unsigned int lookup_index) /*static*/ bool PosLookup::apply_recurse_func (hb_ot_apply_context_t *c, unsigned int lookup_index)
{ {
const PosLookup &l = c->face->table.GPOS.get_relaxed ()->table->get_lookup (lookup_index); const PosLookup &l = c->face->table.GPOS.get_relaxed ()->table->get_lookup (lookup_index);
unsigned int saved_lookup_props = c->lookup_props; unsigned int saved_lookup_props = c->lookup_props;

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

@ -1335,7 +1335,7 @@ struct SubstLookup : Lookup
const SubTable& get_subtable (unsigned int i) const const SubTable& get_subtable (unsigned int i) const
{ return Lookup::get_subtable<SubTable> (i); } { return Lookup::get_subtable<SubTable> (i); }
HB_INTERNAL static bool lookup_type_is_reverse (unsigned int lookup_type) static inline bool lookup_type_is_reverse (unsigned int lookup_type)
{ return lookup_type == SubTable::ReverseChainSingle; } { return lookup_type == SubTable::ReverseChainSingle; }
bool is_reverse () const bool is_reverse () const
@ -1393,7 +1393,7 @@ struct SubstLookup : Lookup
return dispatch (c); return dispatch (c);
} }
HB_INTERNAL static bool apply_recurse_func (hb_ot_apply_context_t *c, unsigned int lookup_index); static inline bool apply_recurse_func (hb_ot_apply_context_t *c, unsigned int lookup_index);
SubTable& serialize_subtable (hb_serialize_context_t *c, SubTable& serialize_subtable (hb_serialize_context_t *c,
unsigned int i) unsigned int i)
@ -1460,9 +1460,9 @@ struct SubstLookup : Lookup
} }
template <typename context_t> template <typename context_t>
HB_INTERNAL static typename context_t::return_t dispatch_recurse_func (context_t *c, unsigned int lookup_index); static inline typename context_t::return_t dispatch_recurse_func (context_t *c, unsigned int lookup_index);
HB_INTERNAL static hb_closure_context_t::return_t dispatch_closure_recurse_func (hb_closure_context_t *c, unsigned int lookup_index) static inline hb_closure_context_t::return_t dispatch_closure_recurse_func (hb_closure_context_t *c, unsigned int lookup_index)
{ {
if (!c->should_visit_lookup (lookup_index)) if (!c->should_visit_lookup (lookup_index))
return hb_empty_t (); return hb_empty_t ();
@ -1529,7 +1529,7 @@ template <typename context_t>
const SubstLookup &l = c->face->table.GSUB.get_relaxed ()->table->get_lookup (lookup_index); const SubstLookup &l = c->face->table.GSUB.get_relaxed ()->table->get_lookup (lookup_index);
return l.dispatch (c); return l.dispatch (c);
} }
/*static*/ inline bool SubstLookup::apply_recurse_func (hb_ot_apply_context_t *c, unsigned int lookup_index) /*static*/ bool SubstLookup::apply_recurse_func (hb_ot_apply_context_t *c, unsigned int lookup_index)
{ {
const SubstLookup &l = c->face->table.GSUB.get_relaxed ()->table->get_lookup (lookup_index); const SubstLookup &l = c->face->table.GSUB.get_relaxed ()->table->get_lookup (lookup_index);
unsigned int saved_lookup_props = c->lookup_props; unsigned int saved_lookup_props = c->lookup_props;

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

@ -623,7 +623,7 @@ struct hb_get_subtables_context_t :
hb_dispatch_context_t<hb_get_subtables_context_t, hb_empty_t, HB_DEBUG_APPLY> hb_dispatch_context_t<hb_get_subtables_context_t, hb_empty_t, HB_DEBUG_APPLY>
{ {
template <typename Type> template <typename Type>
HB_INTERNAL static bool apply_to (const void *obj, OT::hb_ot_apply_context_t *c) static inline bool apply_to (const void *obj, OT::hb_ot_apply_context_t *c)
{ {
const Type *typed_obj = (const Type *) obj; const Type *typed_obj = (const Type *) obj;
return typed_obj->apply (c); return typed_obj->apply (c);