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

[dispatch] Minor

This commit is contained in:
Behdad Esfahbod 2018-12-12 10:07:38 -05:00
parent 602fbfe3c9
commit 2cc993e035
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1535,7 +1535,6 @@ struct PosLookupSubTable
inline typename context_t::return_t dispatch (context_t *c, unsigned int lookup_type) const inline typename context_t::return_t dispatch (context_t *c, unsigned int lookup_type) const
{ {
TRACE_DISPATCH (this, lookup_type); TRACE_DISPATCH (this, lookup_type);
if (unlikely (!c->may_dispatch (this, &u.sub_format))) return_trace (c->no_dispatch_return_value ());
switch (lookup_type) { switch (lookup_type) {
case Single: return_trace (u.single.dispatch (c)); case Single: return_trace (u.single.dispatch (c));
case Pair: return_trace (u.pair.dispatch (c)); case Pair: return_trace (u.pair.dispatch (c));
@ -1552,7 +1551,6 @@ struct PosLookupSubTable
protected: protected:
union { union {
HBUINT16 sub_format;
SinglePos single; SinglePos single;
PairPos pair; PairPos pair;
CursivePos cursive; CursivePos cursive;
@ -1564,7 +1562,7 @@ struct PosLookupSubTable
ExtensionPos extension; ExtensionPos extension;
} u; } u;
public: public:
DEFINE_SIZE_UNION (2, sub_format); DEFINE_SIZE_MIN (0);
}; };

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

@ -1273,7 +1273,6 @@ struct SubstLookupSubTable
inline typename context_t::return_t dispatch (context_t *c, unsigned int lookup_type) const inline typename context_t::return_t dispatch (context_t *c, unsigned int lookup_type) const
{ {
TRACE_DISPATCH (this, lookup_type); TRACE_DISPATCH (this, lookup_type);
if (unlikely (!c->may_dispatch (this, &u.sub_format))) return_trace (c->no_dispatch_return_value ());
switch (lookup_type) { switch (lookup_type) {
case Single: return_trace (u.single.dispatch (c)); case Single: return_trace (u.single.dispatch (c));
case Multiple: return_trace (u.multiple.dispatch (c)); case Multiple: return_trace (u.multiple.dispatch (c));
@ -1289,7 +1288,6 @@ struct SubstLookupSubTable
protected: protected:
union { union {
HBUINT16 sub_format;
SingleSubst single; SingleSubst single;
MultipleSubst multiple; MultipleSubst multiple;
AlternateSubst alternate; AlternateSubst alternate;
@ -1300,7 +1298,7 @@ struct SubstLookupSubTable
ReverseChainSingleSubst reverseChainContextSingle; ReverseChainSingleSubst reverseChainContextSingle;
} u; } u;
public: public:
DEFINE_SIZE_UNION (2, sub_format); DEFINE_SIZE_MIN (0);
}; };