diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2017-01-22 20:31:53 -0800 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2017-01-22 20:31:53 -0800 |
| commit | b732c53eb5bd0c2cc86f35a9d9623c92579a0b8c (patch) | |
| tree | 125c1c5b08b6e0086a62ee801bc1f67a0e7c6557 | |
| parent | 5e156fa5ed33cd1a8ff388833563f15930bb12f9 (diff) | |
| download | harfbuzz_ng-b732c53eb5bd0c2cc86f35a9d9623c92579a0b8c.tar.gz | |
Add LArrayOf<>
| -rw-r--r-- | src/hb-open-type-private.hh | 1 | ||||
| -rw-r--r-- | src/hb-ot-cbdt-table.hh | 4 | ||||
| -rw-r--r-- | src/hb-ot-layout-common-private.hh | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh index 8bd361868..d90d68c59 100644 --- a/src/hb-open-type-private.hh +++ b/src/hb-open-type-private.hh @@ -952,6 +952,7 @@ struct ArrayOf public: DEFINE_SIZE_ARRAY (sizeof (LenType), array); }; +template <typename Type> struct LArrayOf : ArrayOf<Type, ULONG> {}; /* Array of Offset's */ template <typename Type, typename OffsetType=USHORT> diff --git a/src/hb-ot-cbdt-table.hh b/src/hb-ot-cbdt-table.hh index 93cf0e853..0a7fbf5b7 100644 --- a/src/hb-ot-cbdt-table.hh +++ b/src/hb-ot-cbdt-table.hh @@ -348,8 +348,8 @@ struct CBLC } protected: - FixedVersion<>version; - ArrayOf<BitmapSizeTable, ULONG> sizeTables; + FixedVersion<> version; + LArrayOf<BitmapSizeTable> sizeTables; public: DEFINE_SIZE_ARRAY(8, sizeTables); diff --git a/src/hb-ot-layout-common-private.hh b/src/hb-ot-layout-common-private.hh index 2f83497b4..92b5c17ee 100644 --- a/src/hb-ot-layout-common-private.hh +++ b/src/hb-ot-layout-common-private.hh @@ -1527,7 +1527,7 @@ struct FeatureVariations protected: FixedVersion<> version; /* Version--0x00010000u */ - ArrayOf<FeatureVariationRecord, ULONG> + LArrayOf<FeatureVariationRecord> varRecords; public: DEFINE_SIZE_ARRAY (8, varRecords); |