minor, use LOffsetTo and LArrayOf whenever possible (#966)
diff --git a/src/hb-aat-layout-morx-table.hh b/src/hb-aat-layout-morx-table.hh index 54255de..ad3e41c 100644 --- a/src/hb-aat-layout-morx-table.hh +++ b/src/hb-aat-layout-morx-table.hh
@@ -302,9 +302,10 @@ } protected: - StateTable<EntryData> machine; - OffsetTo<UnsizedOffsetListOf<Lookup<GlyphID>, HBUINT32>, HBUINT32> - substitutionTables; + StateTable<EntryData> + machine; + LOffsetTo<UnsizedOffsetListOf<Lookup<GlyphID>, HBUINT32> > + substitutionTables; public: DEFINE_SIZE_STATIC (20); }; @@ -461,7 +462,8 @@ } protected: - StateTable<EntryData> machine; + StateTable<EntryData> + machine; LOffsetTo<UnsizedArrayOf<HBUINT32> > ligAction; /* Offset to the ligature action table. */ LOffsetTo<UnsizedArrayOf<HBUINT16> >
diff --git a/src/hb-aat-ltag-table.hh b/src/hb-aat-ltag-table.hh index 2fd59b6..6d6cb71 100644 --- a/src/hb-aat-ltag-table.hh +++ b/src/hb-aat-ltag-table.hh
@@ -67,7 +67,7 @@ protected: HBUINT32 version; /* Table version; currently 1 */ HBUINT32 flags; /* Table flags; currently none defined */ - ArrayOf<FTStringRange, HBUINT32> + LArrayOf<FTStringRange> tagRanges; /* Range for each tag's string */ public: DEFINE_SIZE_ARRAY (12, tagRanges);
diff --git a/src/hb-open-file-private.hh b/src/hb-open-file-private.hh index ac02752..28f967d 100644 --- a/src/hb-open-file-private.hh +++ b/src/hb-open-file-private.hh
@@ -234,7 +234,7 @@ Tag ttcTag; /* TrueType Collection ID string: 'ttcf' */ FixedVersion<>version; /* Version of the TTC Header (1.0), * 0x00010000u */ - ArrayOf<LOffsetTo<OffsetTable>, HBUINT32> + LArrayOf<LOffsetTo<OffsetTable> > table; /* Array of offsets to the OffsetTable for each font * from the beginning of the file */ public:
diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh index 0207989..4114b35 100644 --- a/src/hb-ot-cmap-table.hh +++ b/src/hb-ot-cmap-table.hh
@@ -284,8 +284,8 @@ protected: HBUINT16 format; /* Subtable format; set to 12. */ HBUINT16 reservedZ; /* Reserved; set to 0. */ - HBUINT32 lengthZ; /* Byte length of this subtable. */ - HBUINT32 languageZ; /* Ignore. */ + HBUINT32 lengthZ; /* Byte length of this subtable. */ + HBUINT32 languageZ; /* Ignore. */ SortedArrayOf<CmapSubtableLongGroup, HBUINT32> groups; /* Groupings. */ public: