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

[kerx] More UnsizedArrayOf<>

This commit is contained in:
Behdad Esfahbod 2018-10-10 20:43:21 -04:00
parent ca54eba484
commit c9165f5450
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hb-aat-layout-kerx-table.hh
View File

@ -205,8 +205,7 @@ struct KerxSubTableFormat2
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
return_trace (likely (rowWidth.sanitize (c) && return_trace (likely (rowWidth.sanitize (c) &&
leftClassTable.sanitize (c, this) && leftClassTable.sanitize (c, this) &&
rightClassTable.sanitize (c, this) && rightClassTable.sanitize (c, this)));
array.sanitize (c, this)));
} }
struct accelerator_t struct accelerator_t
@ -233,7 +232,8 @@ struct KerxSubTableFormat2
LOffsetTo<Lookup<HBUINT16> > LOffsetTo<Lookup<HBUINT16> >
rightClassTable;/* Offset from beginning of this subtable to rightClassTable;/* Offset from beginning of this subtable to
* right-hand class table. */ * right-hand class table. */
LOffsetTo<FWORD> array; /* Offset from beginning of this subtable to LOffsetTo<UnsizedArrayOf<FWORD>, false>
array; /* Offset from beginning of this subtable to
* the start of the kerning array. */ * the start of the kerning array. */
public: public:
DEFINE_SIZE_STATIC (28); DEFINE_SIZE_STATIC (28);
@ -324,12 +324,10 @@ struct KerxSubTableFormat6
is_long () ? is_long () ?
( (
u.l.rowIndexTable.sanitize (c, this) && u.l.rowIndexTable.sanitize (c, this) &&
u.l.columnIndexTable.sanitize (c, this) && u.l.columnIndexTable.sanitize (c, this)
u.l.array.sanitize (c, this)
) : ( ) : (
u.s.rowIndexTable.sanitize (c, this) && u.s.rowIndexTable.sanitize (c, this) &&
u.s.columnIndexTable.sanitize (c, this) && u.s.columnIndexTable.sanitize (c, this)
u.s.array.sanitize (c, this)
))); )));
} }
@ -359,13 +357,15 @@ struct KerxSubTableFormat6
{ {
LOffsetTo<Lookup<HBUINT32> > rowIndexTable; LOffsetTo<Lookup<HBUINT32> > rowIndexTable;
LOffsetTo<Lookup<HBUINT32> > columnIndexTable; LOffsetTo<Lookup<HBUINT32> > columnIndexTable;
LOffsetTo<FWORD32> array; LOffsetTo<UnsizedArrayOf<FWORD32>, false>
array;
} l; } l;
struct Short struct Short
{ {
LOffsetTo<Lookup<HBUINT16> > rowIndexTable; LOffsetTo<Lookup<HBUINT16> > rowIndexTable;
LOffsetTo<Lookup<HBUINT16> > columnIndexTable; LOffsetTo<Lookup<HBUINT16> > columnIndexTable;
LOffsetTo<FWORD> array; LOffsetTo<UnsizedArrayOf<FWORD>, false>
array;
} s; } s;
} u; } u;
public: public: