From b799fc80777c1424e469a835f782b4e0f41c0043 Mon Sep 17 00:00:00 2001
From: Ebrahim Byagowi <ebrahim@gnu.org>
Date: Wed, 11 Apr 2018 18:36:09 +0430
Subject: [PATCH] minor, use LOffsetTo and LArrayOf whenever possible (#966)

---
 src/hb-aat-layout-morx-table.hh | 10 ++++++----
 src/hb-aat-ltag-table.hh        |  2 +-
 src/hb-open-file-private.hh     |  2 +-
 src/hb-ot-cmap-table.hh         |  4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/hb-aat-layout-morx-table.hh b/src/hb-aat-layout-morx-table.hh
index 54255de8d..ad3e41c0b 100644
--- a/src/hb-aat-layout-morx-table.hh
+++ b/src/hb-aat-layout-morx-table.hh
@@ -302,9 +302,10 @@ struct ContextualSubtable
   }
 
   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 @@ struct LigatureSubtable
   }
 
   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 2fd59b6ab..6d6cb7165 100644
--- a/src/hb-aat-ltag-table.hh
+++ b/src/hb-aat-ltag-table.hh
@@ -67,7 +67,7 @@ struct ltag
   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 ac027520d..28f967dd0 100644
--- a/src/hb-open-file-private.hh
+++ b/src/hb-open-file-private.hh
@@ -234,7 +234,7 @@ struct TTCHeaderVersion1
   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 020798986..4114b35d6 100644
--- a/src/hb-ot-cmap-table.hh
+++ b/src/hb-ot-cmap-table.hh
@@ -284,8 +284,8 @@ struct CmapSubtableLongSegmented
   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: