diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2010-06-15 10:54:36 -0400 |
---|---|---|
committer | Behdad Esfahbod <behdad@behdad.org> | 2010-06-15 10:54:36 -0400 |
commit | 7dc0bb2b5aab78d8d7a299b54351bb0e9a4e888d (patch) | |
tree | c31624dce33d214a55d4d999146d6c80645c5a2b /pango/opentype/hb-ot-layout-gsub-private.hh | |
parent | a4ebb72cfb8814a4d3aee9fd0a02a56e998fe6c6 (diff) | |
parent | cf1022c02c89d50a64743b1cf8d989817e4e1fd1 (diff) | |
download | pango-7dc0bb2b5aab78d8d7a299b54351bb0e9a4e888d.tar.gz |
Merge branch 'master' into 1.28
Conflicts:
pango/Makefile.am
Diffstat (limited to 'pango/opentype/hb-ot-layout-gsub-private.hh')
-rw-r--r-- | pango/opentype/hb-ot-layout-gsub-private.hh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pango/opentype/hb-ot-layout-gsub-private.hh b/pango/opentype/hb-ot-layout-gsub-private.hh index d35aaff1..a9f78c24 100644 --- a/pango/opentype/hb-ot-layout-gsub-private.hh +++ b/pango/opentype/hb-ot-layout-gsub-private.hh @@ -702,10 +702,10 @@ struct SubstLookupSubTable } } - inline bool sanitize (SANITIZE_ARG_DEF) { + inline bool sanitize (SANITIZE_ARG_DEF, unsigned int lookup_type) { TRACE_SANITIZE (); - if (!SANITIZE (u.format)) return false; - switch (u.format) { + if (!SANITIZE (u.sub_format)) return false; + switch (lookup_type) { case Single: return u.single->sanitize (SANITIZE_ARG); case Multiple: return u.multiple->sanitize (SANITIZE_ARG); case Alternate: return u.alternate->sanitize (SANITIZE_ARG); @@ -720,7 +720,7 @@ struct SubstLookupSubTable private: union { - USHORT format; + USHORT sub_format; SingleSubst single[VAR]; MultipleSubst multiple[VAR]; AlternateSubst alternate[VAR]; @@ -830,7 +830,7 @@ struct SubstLookup : Lookup TRACE_SANITIZE (); if (!Lookup::sanitize (SANITIZE_ARG)) return false; OffsetArrayOf<SubstLookupSubTable> &list = (OffsetArrayOf<SubstLookupSubTable> &) subTable; - return SANITIZE_THIS (list); + return list.sanitize (SANITIZE_ARG, this, get_type ()); } }; @@ -887,7 +887,7 @@ inline bool ExtensionSubst::sanitize (SANITIZE_ARG_DEF) return Extension::sanitize (SANITIZE_ARG) && (&(Extension::get_subtable ()) == &Null(LookupSubTable) || get_type () == SubstLookupSubTable::Extension || - DECONST_CAST (SubstLookupSubTable, get_subtable (), 0).sanitize (SANITIZE_ARG)); + DECONST_CAST (SubstLookupSubTable, get_subtable (), 0).sanitize (SANITIZE_ARG, get_type ())); } static inline bool substitute_lookup (APPLY_ARG_DEF, unsigned int lookup_index) |