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

Minor

This commit is contained in:
Behdad Esfahbod 2019-05-10 13:56:50 -07:00
parent 5d773ec600
commit 9c0c3589f3
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hb-ot-layout-common.hh
View File

@ -647,10 +647,6 @@ struct Lookup
{ {
unsigned int get_subtable_count () const { return subTable.len; } unsigned int get_subtable_count () const { return subTable.len; }
template <typename TSubTable>
const TSubTable& get_subtable (unsigned int i) const
{ return this+CastR<OffsetArrayOf<TSubTable>> (subTable)[i]; }
template <typename TSubTable> template <typename TSubTable>
const OffsetArrayOf<TSubTable>& get_subtables () const const OffsetArrayOf<TSubTable>& get_subtables () const
{ return CastR<OffsetArrayOf<TSubTable>> (subTable); } { return CastR<OffsetArrayOf<TSubTable>> (subTable); }
@ -658,6 +654,13 @@ struct Lookup
OffsetArrayOf<TSubTable>& get_subtables () OffsetArrayOf<TSubTable>& get_subtables ()
{ return CastR<OffsetArrayOf<TSubTable>> (subTable); } { return CastR<OffsetArrayOf<TSubTable>> (subTable); }
template <typename TSubTable>
const TSubTable& get_subtable (unsigned int i) const
{ return this+get_subtables<TSubTable> ()[i]; }
template <typename TSubTable>
TSubTable& get_subtable (unsigned int i)
{ return this+get_subtables<TSubTable> ()[i]; }
unsigned int get_size () const unsigned int get_size () const
{ {
const HBUINT16 &markFilteringSet = StructAfter<const HBUINT16> (subTable); const HBUINT16 &markFilteringSet = StructAfter<const HBUINT16> (subTable);
@ -745,8 +748,7 @@ struct Lookup
if (!markFilteringSet.sanitize (c)) return_trace (false); if (!markFilteringSet.sanitize (c)) return_trace (false);
} }
if (unlikely (!CastR<OffsetArrayOf<TSubTable>> (subTable) if (unlikely (!get_subtables<TSubTable> ().sanitize (c, this, get_type ())))
.sanitize (c, this, get_type ())))
return_trace (false); return_trace (false);
if (unlikely (get_type () == TSubTable::Extension)) if (unlikely (get_type () == TSubTable::Extension))