commit abcc5ac1fde1c493e4055dd2f27b8aade7713156
author Behdad Esfahbod <behdad@behdad.org> Sat Sep 01 21:30:17 2012 -0400
committer Behdad Esfahbod <behdad@behdad.org> Sat Sep 01 21:30:17 2012 -0400
tree c08bab0885b49ccfb786709bec75d785543b5225
parent bc5be24014371ceb811b9ffd37062ede63d87bb1

[OT] Improve serialize syntax

For some definition of improvement...

src/hb-open-type-private.hh

diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index 70a7d9d..6e9ed16 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -600,9 +600,11 @@
     return StructAtOffset<Type> (base, offset);
   }
 
-  inline void set_offset (void *base, void *obj)
+  inline Type& serialize (hb_serialize_context_t *c, void *base)
   {
-    this->set ((char *) obj - (char *) base);
+    Type *t = (Type *) c->head;
+    this->set ((char *) t - (char *) base);
+    return *t;
   }
 
   inline bool sanitize (hb_sanitize_context_t *c, void *base) {

src/hb-ot-layout-gsub-table.hh

diff --git a/src/hb-ot-layout-gsub-table.hh b/src/hb-ot-layout-gsub-table.hh
index 714b444..ea28bcc 100644
--- a/src/hb-ot-layout-gsub-table.hh
+++ b/src/hb-ot-layout-gsub-table.hh
@@ -79,9 +79,8 @@
   {
     TRACE_SERIALIZE ();
     if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false);
+    if (unlikely (!coverage.serialize (c, this).serialize (c, glyphs, num_glyphs))) return TRACE_RETURN (false);
     deltaGlyphID.set (delta);
-    coverage.set_offset (this, c->head);
-    if (unlikely (!(this+coverage).serialize (c, glyphs, num_glyphs))) return TRACE_RETURN (false);
     return TRACE_RETURN (true);
   }