From 9ef9fc01148ace504d38ecf304f0e49827e4d27b Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Mon, 11 Jul 2022 13:29:23 -0600
Subject: [PATCH] [>64k:layout] Templatize GSUBGPOSFormat1

---
 src/hb-open-type.hh          |  2 +-
 src/hb-ot-layout-common.hh   |  4 ++--
 src/hb-ot-layout-gsubgpos.hh | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/hb-open-type.hh b/src/hb-open-type.hh
index b87046ab2..2c1c49b15 100644
--- a/src/hb-open-type.hh
+++ b/src/hb-open-type.hh
@@ -774,7 +774,7 @@ struct List16OfOffsetTo : ArrayOf<OffsetTo<Type, OffsetType>, HBUINT16>
   bool sanitize (hb_sanitize_context_t *c, Ts&&... ds) const
   {
     TRACE_SANITIZE (this);
-    return_trace (Array16OfOffset16To<Type>::sanitize (c, this, std::forward<Ts> (ds)...));
+    return_trace ((Array16Of<OffsetTo<Type, OffsetType>>::sanitize (c, this, std::forward<Ts> (ds)...)));
   }
 };
 
diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh
index 0d13e4bbc..8cb359e6d 100644
--- a/src/hb-ot-layout-common.hh
+++ b/src/hb-ot-layout-common.hh
@@ -1407,8 +1407,8 @@ struct Lookup
 template <typename Types>
 using LookupList = List16OfOffsetTo<Lookup, typename Types::HBUINT>;
 
-template <typename TLookup>
-struct LookupOffsetList : List16OfOffset16To<TLookup>
+template <typename TLookup, typename OffsetType>
+struct LookupOffsetList : List16OfOffsetTo<TLookup, OffsetType>
 {
   bool subset (hb_subset_context_t        *c,
 	       hb_subset_layout_context_t *l) const
diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh
index df2a3febf..dcd0d7c7f 100644
--- a/src/hb-ot-layout-gsubgpos.hh
+++ b/src/hb-ot-layout-gsubgpos.hh
@@ -4020,7 +4020,7 @@ struct GSUBGPOSVersion1_2
 		    likely (version.major == 1) &&
 		    scriptList.sanitize (c, this) &&
 		    featureList.sanitize (c, this) &&
-		    reinterpret_cast<const Offset16To<TLookupList> &> (lookupList).sanitize (c, this))))
+		    reinterpret_cast<const typename Types::template OffsetTo<TLookupList> &> (lookupList).sanitize (c, this))))
       return_trace (false);
 
 #ifndef HB_NO_VAR
@@ -4038,16 +4038,16 @@ struct GSUBGPOSVersion1_2
     auto *out = c->subset_context->serializer->embed (*this);
     if (unlikely (!out)) return_trace (false);
 
-    typedef LookupOffsetList<TLookup> TLookupList;
-    reinterpret_cast<Offset16To<TLookupList> &> (out->lookupList)
+    typedef LookupOffsetList<TLookup, typename Types::HBUINT> TLookupList;
+    reinterpret_cast<typename Types::template OffsetTo<TLookupList> &> (out->lookupList)
 	.serialize_subset (c->subset_context,
-			   reinterpret_cast<const Offset16To<TLookupList> &> (lookupList),
+			   reinterpret_cast<const typename Types::template OffsetTo<TLookupList> &> (lookupList),
 			   this,
 			   c);
 
-    reinterpret_cast<Offset16To<RecordListOfFeature> &> (out->featureList)
+    reinterpret_cast<typename Types::template OffsetTo<RecordListOfFeature> &> (out->featureList)
 	.serialize_subset (c->subset_context,
-			   reinterpret_cast<const Offset16To<RecordListOfFeature> &> (featureList),
+			   reinterpret_cast<const typename Types::template OffsetTo<RecordListOfFeature> &> (featureList),
 			   this,
 			   c);