commit 19afd25004487cfaa7b487b1768b4dae1ab37296
author Qunxin Liu <qxliu@google.com> Wed Apr 24 14:02:29 2019 -0700
committer Garret Rieger <grieger@google.com> Fri Apr 26 15:24:47 2019 -0700
tree 746fc444fcd43082146da7136a8e3a7ecdaf4772
parent 1ca4b5c77012ed586413f39e730b03bf965e1305

[subset] Update to use _subset2() for name table

src/hb-subset.cc

diff --git a/src/hb-subset.cc b/src/hb-subset.cc
index 333e7d4..2165b8a 100644
--- a/src/hb-subset.cc
+++ b/src/hb-subset.cc
@@ -88,7 +88,6 @@
     serializer.start_serialize<TableType> ();
     hb_subset_context_t c (plan, &serializer);
     result = table->subset (&c);
-    serializer.end_serialize ();
     if (serializer.ran_out_of_room)
     {
       buf_size += (buf_size >> 1) + 32;
@@ -105,6 +104,7 @@
       abort ();
     }
 
+    serializer.end_serialize ();
     if (result)
     {
       hb_blob_t *dest_blob = serializer.copy_blob ();
@@ -160,7 +160,7 @@
       result = _subset<const OT::hdmx> (plan);
       break;
     case HB_OT_TAG_name:
-      result = _subset<const OT::name> (plan);
+      result = _subset2<const OT::name> (plan);
       break;
     case HB_OT_TAG_head:
       // TODO that won't work well if there is no glyf