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

Improve Subst/Pos SubTable access and sanitize

This commit is contained in:
Behdad Esfahbod 2010-04-22 01:01:35 -04:00
parent 81f2af40f9
commit bb1e16335e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1440,7 +1440,7 @@ struct PosLookupSubTable
struct PosLookup : Lookup struct PosLookup : Lookup
{ {
inline const PosLookupSubTable& get_subtable (unsigned int i) const inline const PosLookupSubTable& get_subtable (unsigned int i) const
{ return (const PosLookupSubTable&) Lookup::get_subtable (i); } { return this+CONST_CAST (OffsetArrayOf<PosLookupSubTable>, subTable, 0)[i]; }
/* Like get_type(), but looks through extension lookups. /* Like get_type(), but looks through extension lookups.
* Never returns Extension */ * Never returns Extension */
@ -1519,7 +1519,7 @@ struct PosLookup : Lookup
inline bool sanitize (SANITIZE_ARG_DEF) { inline bool sanitize (SANITIZE_ARG_DEF) {
TRACE_SANITIZE (); TRACE_SANITIZE ();
if (!Lookup::sanitize (SANITIZE_ARG)) return false; if (!Lookup::sanitize (SANITIZE_ARG)) return false;
OffsetArrayOf<PosLookupSubTable> &list = (OffsetArrayOf<PosLookupSubTable> &) subTable; OffsetArrayOf<PosLookupSubTable> &list = CAST (OffsetArrayOf<PosLookupSubTable>, subTable, 0);
return SANITIZE_THIS (list); return SANITIZE_THIS (list);
} }
}; };

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

@ -736,7 +736,7 @@ struct SubstLookupSubTable
struct SubstLookup : Lookup struct SubstLookup : Lookup
{ {
inline const SubstLookupSubTable& get_subtable (unsigned int i) const inline const SubstLookupSubTable& get_subtable (unsigned int i) const
{ return CONST_CAST (SubstLookupSubTable, Lookup::get_subtable (i), 0); } { return this+CONST_CAST (OffsetArrayOf<SubstLookupSubTable>, subTable, 0)[i]; }
/* Like get_type(), but looks through extension lookups. /* Like get_type(), but looks through extension lookups.
* Never returns Extension */ * Never returns Extension */
@ -829,7 +829,7 @@ struct SubstLookup : Lookup
inline bool sanitize (SANITIZE_ARG_DEF) { inline bool sanitize (SANITIZE_ARG_DEF) {
TRACE_SANITIZE (); TRACE_SANITIZE ();
if (!Lookup::sanitize (SANITIZE_ARG)) return false; if (!Lookup::sanitize (SANITIZE_ARG)) return false;
OffsetArrayOf<SubstLookupSubTable> &list = (OffsetArrayOf<SubstLookupSubTable> &) subTable; OffsetArrayOf<SubstLookupSubTable> &list = CAST (OffsetArrayOf<SubstLookupSubTable>, subTable, 0);
return SANITIZE_THIS (list); return SANITIZE_THIS (list);
} }
}; };