This commit is contained in:
Behdad Esfahbod 2018-10-28 16:29:09 -07:00
parent 6562172381
commit e8ff27c208
2 changed files with 6 additions and 4 deletions

View File

@ -539,8 +539,10 @@ template <typename Type> struct LArrayOf : ArrayOf<Type, HBUINT32> {};
typedef ArrayOf<HBUINT8, HBUINT8> PString; typedef ArrayOf<HBUINT8, HBUINT8> PString;
/* Array of Offset's */ /* Array of Offset's */
template <typename Type, typename OffsetType=HBUINT16> template <typename Type>
struct OffsetArrayOf : ArrayOf<OffsetTo<Type, OffsetType> > {}; struct OffsetArrayOf : ArrayOf<OffsetTo<Type, HBUINT16> > {};
template <typename Type>
struct LOffsetArrayOf : ArrayOf<OffsetTo<Type, HBUINT32> > {};
template <typename Type> template <typename Type>
struct LOffsetLArrayOf : ArrayOf<OffsetTo<Type, HBUINT32>, HBUINT32> {}; struct LOffsetLArrayOf : ArrayOf<OffsetTo<Type, HBUINT32>, HBUINT32> {};

View File

@ -1605,7 +1605,7 @@ struct VariationStore
protected: protected:
HBUINT16 format; HBUINT16 format;
LOffsetTo<VarRegionList> regions; LOffsetTo<VarRegionList> regions;
OffsetArrayOf<VarData, HBUINT32> dataSets; LOffsetArrayOf<VarData> dataSets;
public: public:
DEFINE_SIZE_ARRAY (8, dataSets); DEFINE_SIZE_ARRAY (8, dataSets);
}; };
@ -1687,7 +1687,7 @@ struct ConditionSet
} }
protected: protected:
OffsetArrayOf<Condition, HBUINT32> conditions; LOffsetArrayOf<Condition> conditions;
public: public:
DEFINE_SIZE_ARRAY (2, conditions); DEFINE_SIZE_ARRAY (2, conditions);
}; };