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

[aat] Fix some struct sizes 

I hate it that with my compiler at least, it doesn't catch totally uncompilable
statements in templates if they are not used...
This commit is contained in:
Behdad Esfahbod 2018-01-12 12:04:53 +01:00
parent 57051b4f67
commit 9009b341c4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-aat-layout-common-private.hh
View File

@ -602,7 +602,7 @@ struct StateTable
entryTable; /* Offset to the entry array. */ entryTable; /* Offset to the entry array. */
public: public:
DEFINE_SIZE_UNION (2, format); DEFINE_SIZE_STATIC (16);
}; };
template <typename EntryData> template <typename EntryData>

8
src/hb-aat-layout-morx-table.hh
View File

@ -169,7 +169,7 @@ struct RearrangementSubtable
protected: protected:
StateTable<void> machine; StateTable<void> machine;
public: public:
DEFINE_SIZE_MIN (2); DEFINE_SIZE_STATIC (16);
}; };
struct ContextualSubtable struct ContextualSubtable
@ -283,7 +283,7 @@ struct ContextualSubtable
OffsetTo<UnsizedOffsetListOf<Lookup<GlyphID>, HBUINT32>, HBUINT32> OffsetTo<UnsizedOffsetListOf<Lookup<GlyphID>, HBUINT32>, HBUINT32>
substitutionTables; substitutionTables;
public: public:
DEFINE_SIZE_MIN (2); DEFINE_SIZE_STATIC (20);
}; };
struct LigatureSubtable struct LigatureSubtable
@ -436,7 +436,7 @@ struct ChainSubtable
InsertionSubtable insertion; InsertionSubtable insertion;
} u; } u;
public: public:
DEFINE_SIZE_MIN (2 * sizeof (HBUINT32) + 4); DEFINE_SIZE_MIN (12);
}; };
struct Chain struct Chain
@ -488,7 +488,7 @@ struct Chain
// subtableGlyphCoverageArray if major == 3 // subtableGlyphCoverageArray if major == 3
public: public:
DEFINE_SIZE_MIN (8 + 2 * sizeof (HBUINT32)); DEFINE_SIZE_MIN (16);
}; };