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

[gsub] Minor

This commit is contained in:
Behdad Esfahbod 2019-05-31 15:48:54 -07:00
parent 2dbdec66a1
commit 2ad4ba7bc0
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,7 +180,7 @@ struct SingleSubstFormat2
template<typename Iterator, template<typename Iterator,
hb_requires (hb_is_sorted_source_of (Iterator, hb_requires (hb_is_sorted_source_of (Iterator,
const hb_codepoint_pair_t))> hb_codepoint_pair_t))>
bool serialize (hb_serialize_context_t *c, bool serialize (hb_serialize_context_t *c,
Iterator it) Iterator it)
{ {
@ -1287,7 +1287,7 @@ struct SubstLookup : Lookup
HB_INTERNAL static bool apply_recurse_func (hb_ot_apply_context_t *c, unsigned int lookup_index); HB_INTERNAL static 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)
{ return get_subtables<SubTable> ()[i].serialize (c, this); } { return get_subtables<SubTable> ()[i].serialize (c, this); }
bool serialize_single (hb_serialize_context_t *c, bool serialize_single (hb_serialize_context_t *c,
@ -1297,9 +1297,8 @@ struct SubstLookup : Lookup
{ {
TRACE_SERIALIZE (this); TRACE_SERIALIZE (this);
if (unlikely (!Lookup::serialize (c, SubTable::Single, lookup_props, 1))) return_trace (false); if (unlikely (!Lookup::serialize (c, SubTable::Single, lookup_props, 1))) return_trace (false);
return_trace (serialize_subtable (c, 0).u.single.
return_trace (serialize_subtable (c, 0).u.single serialize (c, hb_zip (glyphs, substitutes)));
.serialize (c, hb_zip (glyphs, substitutes)));
} }
bool serialize_multiple (hb_serialize_context_t *c, bool serialize_multiple (hb_serialize_context_t *c,
@ -1310,10 +1309,11 @@ struct SubstLookup : Lookup
{ {
TRACE_SERIALIZE (this); TRACE_SERIALIZE (this);
if (unlikely (!Lookup::serialize (c, SubTable::Multiple, lookup_props, 1))) return_trace (false); if (unlikely (!Lookup::serialize (c, SubTable::Multiple, lookup_props, 1))) return_trace (false);
return_trace (serialize_subtable (c, 0).u.multiple.serialize (c, return_trace (serialize_subtable (c, 0).u.multiple.
glyphs, serialize (c,
substitute_len_list, glyphs,
substitute_glyphs_list)); substitute_len_list,
substitute_glyphs_list));
} }
bool serialize_alternate (hb_serialize_context_t *c, bool serialize_alternate (hb_serialize_context_t *c,
@ -1324,10 +1324,11 @@ struct SubstLookup : Lookup
{ {
TRACE_SERIALIZE (this); TRACE_SERIALIZE (this);
if (unlikely (!Lookup::serialize (c, SubTable::Alternate, lookup_props, 1))) return_trace (false); if (unlikely (!Lookup::serialize (c, SubTable::Alternate, lookup_props, 1))) return_trace (false);
return_trace (serialize_subtable (c, 0).u.alternate.serialize (c, return_trace (serialize_subtable (c, 0).u.alternate.
glyphs, serialize (c,
alternate_len_list, glyphs,
alternate_glyphs_list)); alternate_len_list,
alternate_glyphs_list));
} }
bool serialize_ligature (hb_serialize_context_t *c, bool serialize_ligature (hb_serialize_context_t *c,
@ -1340,12 +1341,13 @@ struct SubstLookup : Lookup
{ {
TRACE_SERIALIZE (this); TRACE_SERIALIZE (this);
if (unlikely (!Lookup::serialize (c, SubTable::Ligature, lookup_props, 1))) return_trace (false); if (unlikely (!Lookup::serialize (c, SubTable::Ligature, lookup_props, 1))) return_trace (false);
return_trace (serialize_subtable (c, 0).u.ligature.serialize (c, return_trace (serialize_subtable (c, 0).u.ligature.
first_glyphs, serialize (c,
ligature_per_first_glyph_count_list, first_glyphs,
ligatures_list, ligature_per_first_glyph_count_list,
component_count_list, ligatures_list,
component_list)); component_count_list,
component_list));
} }
template <typename context_t> template <typename context_t>