From a2681c37c171143858ade2f91c9eff876c0aa586 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 1 Dec 2022 16:09:03 -0700
Subject: [PATCH] [cff-subset] Simplify INDEX serialize() more

---
 src/hb-ot-cff-common.hh | 21 ++++++---------------
 src/hb-ot-cff1-table.hh |  2 --
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/hb-ot-cff-common.hh b/src/hb-ot-cff-common.hh
index 5f519bfc4..2a17b3218 100644
--- a/src/hb-ot-cff-common.hh
+++ b/src/hb-ot-cff-common.hh
@@ -72,28 +72,19 @@ struct CFFIndex
     return_trace (out);
   }
 
-  template <typename Iterator,
-	    hb_requires (hb_is_iterator (Iterator))>
+  template <typename Iterable,
+	    hb_requires (hb_is_iterable (Iterable))>
   bool serialize (hb_serialize_context_t *c,
-		  Iterator it)
+		  const Iterable &iterable)
   {
     TRACE_SERIALIZE (this);
-    serialize_header(c, + it | hb_map ([] (const hb_ubytes_t &_) { return _.length; }));
+    auto it = hb_iter (iterable);
+    serialize_header(c, + it | hb_map (hb_iter) | hb_map (hb_len));
     for (const auto &_ : +it)
-      _.copy (c);
+      hb_iter (_).copy (c);
     return_trace (true);
   }
 
-  bool serialize (hb_serialize_context_t *c,
-		  const str_buff_vec_t &buffArray)
-  {
-    auto it =
-    + hb_iter (buffArray)
-    | hb_map ([] (const str_buff_t &_) { return hb_ubytes_t (_.arrayZ, _.length); })
-    ;
-    return serialize (c, it);
-  }
-
   template <typename Iterator,
 	    hb_requires (hb_is_iterator (Iterator))>
   bool serialize_header (hb_serialize_context_t *c,
diff --git a/src/hb-ot-cff1-table.hh b/src/hb-ot-cff1-table.hh
index 54ef270bc..bb856c9dd 100644
--- a/src/hb-ot-cff1-table.hh
+++ b/src/hb-ot-cff1-table.hh
@@ -617,7 +617,6 @@ struct CFF1StringIndex : CFF1Index
     }
 
     byte_str_array_t bytesArray;
-    bytesArray.init ();
     if (!bytesArray.resize (sidmap.get_population ()))
       return_trace (false);
     for (unsigned int i = 0; i < strings.count; i++)
@@ -628,7 +627,6 @@ struct CFF1StringIndex : CFF1Index
     }
 
     bool result = CFF1Index::serialize (c, bytesArray);
-    bytesArray.fini ();
     return_trace (result);
   }
 };