commit 1834cf86d40abfbb536db1edb366c90318ba49fc
author Behdad Esfahbod <behdad@behdad.org> Fri May 31 14:39:32 2019 -0700
committer Behdad Esfahbod <behdad@behdad.org> Fri May 31 14:39:32 2019 -0700
tree ed4e5713ea3a362d3e64db04e9e7ca938ac61a5e
parent 926044162472aeca8f5032b11b544d38be587110

[serialize] Pass offset to serialize_subset()

src/hb-open-type.hh

diff --git a/src/hb-open-type.hh b/src/hb-open-type.hh
index a2521dc..de2d256 100644
--- a/src/hb-open-type.hh
+++ b/src/hb-open-type.hh
@@ -298,20 +298,24 @@
   }
 
   template <typename ...Ts>
-  bool serialize_subset (hb_subset_context_t *c, const Type &src, const void *base, Ts&&... ds)
+  bool serialize_subset (hb_subset_context_t *c,
+			 const OffsetTo& src,
+			 const void *src_base,
+			 const void *dst_base,
+			 Ts&&... ds)
   {
     *this = 0;
-    if (has_null && &src == _hb_has_null<Type, has_null>::get_null ())
+    if (src.is_null ())
       return false;
 
     auto *s = c->serializer;
 
     s->push ();
 
-    bool ret = c->dispatch (src, hb_forward<Ts> (ds)...);
+    bool ret = c->dispatch (src_base+src, hb_forward<Ts> (ds)...);
 
     if (ret || !has_null)
-      s->add_link (*this, s->pop_pack (), base);
+      s->add_link (*this, s->pop_pack (), dst_base);
     else
       s->pop_discard ();
 
@@ -683,7 +687,7 @@
     if (unlikely (!out)) return_trace (false);
     unsigned int count = this->len;
     for (unsigned int i = 0; i < count; i++)
-      out->arrayZ[i].serialize_subset (c, (*this)[i], out);
+      out->arrayZ[i].serialize_subset (c, this->arrayZ[i], this, out);
     return_trace (true);
   }