From 81f2af40f9afd5bb9695018e6baddcd4aa3361c1 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 22 Apr 2010 00:58:49 -0400
Subject: [PATCH] Simplify Extension offset now that our int types have no
 alignment

---
 src/hb-ot-layout-gsubgpos-private.hh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh
index 5d19c7e2e..a68e5a431 100644
--- a/src/hb-ot-layout-gsubgpos-private.hh
+++ b/src/hb-ot-layout-gsubgpos-private.hh
@@ -835,10 +835,9 @@ struct ExtensionFormat1
 
   protected:
   inline unsigned int get_type (void) const { return extensionLookupType; }
-  inline unsigned int get_offset (void) const { return (extensionOffset[0] << 16) + extensionOffset[1]; }
   inline const LookupSubTable& get_subtable (void) const
   {
-    unsigned int offset = get_offset ();
+    unsigned int offset = extensionOffset;
     if (HB_UNLIKELY (!offset)) return Null(LookupSubTable);
     return CONST_CAST (LookupSubTable, *this, offset);
   }
@@ -853,10 +852,8 @@ struct ExtensionFormat1
   USHORT	extensionLookupType;	/* Lookup type of subtable referenced
 					 * by ExtensionOffset (i.e. the
 					 * extension subtable). */
-  USHORT	extensionOffset[2];	/* Offset to the extension subtable,
-					 * of lookup type subtable.
-					 * Defined as two shorts to avoid
-					 * alignment requirements. */
+  ULONG		extensionOffset;	/* Offset to the extension subtable,
+					 * of lookup type subtable. */
 };
 ASSERT_SIZE (ExtensionFormat1, 8);