Merge pull request #812 from googlefonts/cleanup

Clean up of glyf subsetting.

src/hb-ot-glyf-table.hh

@@ -29,7 +29,9 @@
 
 #include "hb-open-type-private.hh"
 #include "hb-ot-head-table.hh"
-
+#include "hb-subset-glyf.hh"
+#include "hb-subset-plan.hh"
+#include "hb-subset-private.hh"
 
 namespace OT {
 
@@ -78,6 +80,44 @@ struct glyf
     return_trace (true);
   }
 
+  inline bool subset (hb_subset_plan_t *plan) const
+  {
+    hb_blob_t *glyf_prime = nullptr;
+    hb_blob_t *loca_prime = nullptr;
+
+    bool success = true;
+    bool use_short_loca = false;
+    if (hb_subset_glyf_and_loca (plan, &use_short_loca, &glyf_prime, &loca_prime)) {
+      success = success && hb_subset_plan_add_table (plan, HB_OT_TAG_glyf, glyf_prime);
+      success = success && hb_subset_plan_add_table (plan, HB_OT_TAG_loca, loca_prime);
+      success = success && _add_head_and_set_loca_version (plan->source, use_short_loca, plan->dest);
+    } else {
+      success = false;
+    }
+    hb_blob_destroy (loca_prime);
+    hb_blob_destroy (glyf_prime);
+
+    return success;
+  }
+
+  static bool
+  _add_head_and_set_loca_version (hb_face_t *source, bool use_short_loca, hb_face_t *dest)
+  {
+    hb_blob_t *head_blob = OT::Sanitizer<OT::head>().sanitize (hb_face_reference_table (source, HB_OT_TAG_head));
+    hb_blob_t *head_prime_blob = hb_blob_copy_writable_or_fail (head_blob);
+    hb_blob_destroy (head_blob);
+
+    if (unlikely (!head_prime_blob))
+      return false;
+
+    OT::head *head_prime = (OT::head *) hb_blob_get_data_writable (head_prime_blob, nullptr);
+    head_prime->indexToLocFormat.set (use_short_loca ? 0 : 1);
+    bool success = hb_subset_face_add_table (dest, HB_OT_TAG_head, head_prime_blob);
+
+    hb_blob_destroy (head_prime_blob);
+    return success;
+  }
+
   struct GlyphHeader
   {
     HBINT16		numberOfContours;	/* If the number of contours is

src/hb-ot-maxp-table.hh

@@ -70,8 +70,7 @@ struct maxp
     if (unlikely (!maxp_prime_blob)) {
       return false;
     }
-    unsigned int length;
+    OT::maxp *maxp_prime = (OT::maxp *) hb_blob_get_data (maxp_prime_blob, nullptr);
-    OT::maxp *maxp_prime = (OT::maxp *) hb_blob_get_data (maxp_prime_blob, &length);
 
     maxp_prime->set_num_glyphs (plan->gids_to_retain_sorted.len);
 

src/hb-subset.cc

@@ -219,63 +219,15 @@ hb_subset_face_add_table (hb_face_t *face, hb_tag_t tag, hb_blob_t *blob)
   return true;
 }
 
-static bool
-_add_head_and_set_loca_version (hb_face_t *source, bool use_short_loca, hb_face_t *dest)
-{
-  hb_blob_t *head_blob = OT::Sanitizer<OT::head>().sanitize (hb_face_reference_table (source, HB_OT_TAG_head));
-  const OT::head *head = OT::Sanitizer<OT::head>::lock_instance (head_blob);
-  hb_bool_t has_head = (head != nullptr);
-
-  if (has_head) {
-    OT::head *head_prime = (OT::head *) malloc (OT::head::static_size);
-    memcpy (head_prime, head, OT::head::static_size);
-    head_prime->indexToLocFormat.set (use_short_loca ? 0 : 1);
-
-    hb_blob_t *head_prime_blob = hb_blob_create ((const char*) head_prime,
-                                                 OT::head::static_size,
-                                                 HB_MEMORY_MODE_READONLY,
-                                                 head_prime,
-                                                 free);
-    has_head = hb_subset_face_add_table (dest, HB_OT_TAG_head, head_prime_blob);
-    hb_blob_destroy (head_prime_blob);
-  }
-
-  hb_blob_destroy (head_blob);
-  return has_head;
-}
-
-static bool
-_subset_glyf (hb_subset_plan_t *plan)
-{
-  hb_blob_t *glyf_prime = nullptr;
-  hb_blob_t *loca_prime = nullptr;
-
-  bool success = true;
-  bool use_short_loca = false;
-  // TODO(grieger): Migrate to subset function on the table like cmap.
-  if (hb_subset_glyf_and_loca (plan, &use_short_loca, &glyf_prime, &loca_prime)) {
-    success = success && hb_subset_plan_add_table (plan, HB_OT_TAG_glyf, glyf_prime);
-    success = success && hb_subset_plan_add_table (plan, HB_OT_TAG_loca, loca_prime);
-    success = success && _add_head_and_set_loca_version (plan->source, use_short_loca, plan->dest);
-  } else {
-    success = false;
-  }
-  hb_blob_destroy (loca_prime);
-  hb_blob_destroy (glyf_prime);
-
-  return success;
-}
-
 static bool
 _subset_table (hb_subset_plan_t *plan,
                hb_tag_t          tag)
 {
-  // TODO (grieger): Handle updating the head table (loca format + num glyphs)
   DEBUG_MSG(SUBSET, nullptr, "begin subset %c%c%c%c", HB_UNTAG(tag));
   bool result = true;
   switch (tag) {
     case HB_OT_TAG_glyf:
-      result = _subset_glyf (plan);
+      result = _subset<const OT::glyf> (plan);
       break;
     case HB_OT_TAG_head:
       // SKIP head, it's handled by glyf