[mort] More fixes]

This commit is contained in:
Behdad Esfahbod 2018-10-30 21:49:59 -07:00
parent e1552af95b
commit 11dbf0f129
1 changed files with 2 additions and 3 deletions

View File

@ -430,9 +430,8 @@ struct StateTable
CLASS_END_OF_LINE = 3, CLASS_END_OF_LINE = 3,
}; };
inline unsigned int row_stride (void) const { return nClasses * sizeof (HBUSHORT); }
inline unsigned int new_state (unsigned int newState) const inline unsigned int new_state (unsigned int newState) const
{ return newState / (Types::extended ? 1 : row_stride ()); } { return Types::extended ? newState : (newState - stateArrayTable) / nClasses; }
inline unsigned int get_class (hb_codepoint_t glyph_id, unsigned int num_glyphs) const inline unsigned int get_class (hb_codepoint_t glyph_id, unsigned int num_glyphs) const
{ {
@ -524,7 +523,7 @@ struct StateTable
entryTable; /* Offset to the entry array. */ entryTable; /* Offset to the entry array. */
public: public:
DEFINE_SIZE_STATIC (16); DEFINE_SIZE_STATIC (4 * sizeof (HBUINT));
}; };
struct ClassTable struct ClassTable