Add LArrayOf<>

diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index 8bd3618..d90d68c 100644 (file)
--- 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 93cf0e8..0a7fbf5 100644 (file)
--- 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 2f83497..92b5c17 100644 (file)
--- 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);