提交 9009b341 编写于 作者: B Behdad Esfahbod

[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...
上级 57051b4f
...@@ -602,7 +602,7 @@ struct StateTable ...@@ -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>
......
...@@ -169,7 +169,7 @@ struct RearrangementSubtable ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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);
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册