From 84811a06a26508effe9f4a9eaf1be15297ecf0cb Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 23 Oct 2018 03:16:03 -0700
Subject: [PATCH] [name] Fix for rebase changes to hb_array_t

---
 src/hb-ot-name-table.hh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hb-ot-name-table.hh b/src/hb-ot-name-table.hh
index f0b5a5e68..8967fcbd8 100644
--- a/src/hb-ot-name-table.hh
+++ b/src/hb-ot-name-table.hh
@@ -137,7 +137,7 @@ struct name
 
   inline hb_bytes_t get_name (unsigned int idx) const
   {
-    const hb_array_t<NameRecord> &all_names = hb_array_t<NameRecord> (nameRecordZ.arrayZ, count);
+    const hb_array_t<const NameRecord> all_names (nameRecordZ.arrayZ, count);
     const NameRecord &record = all_names[idx];
     return hb_bytes_t ((char *) this + stringOffset + record.offset, record.length);
   }
@@ -170,8 +170,8 @@ struct name
     {
       this->blob = hb_sanitize_context_t().reference_table<name> (face);
       this->table = this->blob->as<name> ();
-      const hb_array_t<NameRecord> &all_names = hb_array_t<NameRecord> (this->table->nameRecordZ.arrayZ,
-									this->table->count);
+      const hb_array_t<const NameRecord> all_names (this->table->nameRecordZ.arrayZ,
+						    this->table->count);
 
       this->names.init ();
       this->names.alloc (all_names.len);