[subset] Updates due to changes in resolve_links() on master branch

diff --git a/src/Makefile.sources b/src/Makefile.sources
index 803d229..e61315b 100644 (file)
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -84,6 +84,7 @@ HB_BASE_sources = \
        hb-ot-math-table.hh \
        hb-ot-math.cc \
        hb-ot-maxp-table.hh \
+       hb-ot-name-language-static.hh \
        hb-ot-name-language.hh \
        hb-ot-name-table.hh \
        hb-ot-name.cc \

diff --git a/src/hb-ot-name-table.hh b/src/hb-ot-name-table.hh
index 056a77a..72deb10 100644 (file)
--- a/src/hb-ot-name-table.hh
+++ b/src/hb-ot-name-table.hh
@@ -187,8 +187,11 @@ struct name
       }
 
       c->push<NameRecord> ();
-      if (!c->embed (source_name->nameRecordZ[idx]))
+
+      NameRecord *p = c->embed<NameRecord> (source_name->nameRecordZ[idx]);
+      if (!p)
         return false;
+      p->offset = 0;
     }
 
     return true;
@@ -233,7 +236,7 @@ struct name
                                 hb_serialize_context_t *c, 
                                 unsigned length)
   {
-    hb_hashmap_t<unsigned, unsigned, -1, 0> id_str_idx_map;
+    hb_hashmap_t<unsigned, unsigned> id_str_idx_map;
     for (int i = length-1; i >= 0; i--)
     {
       unsigned objidx = c->pop_pack ();

diff --git a/src/hb-static.cc b/src/hb-static.cc
index d2d8044..6b89183 100644 (file)
--- a/src/hb-static.cc
+++ b/src/hb-static.cc
@@ -36,9 +36,8 @@
 #include "hb-ot-head-table.hh"
 #include "hb-ot-maxp-table.hh"
 
-#include "hb-ot-name-language-static.hh"
-
 #ifndef HB_NO_VISIBILITY
+#include "hb-ot-name-language-static.hh"
 
 hb_vector_size_impl_t const _hb_NullPool[(HB_NULL_POOL_SIZE + sizeof (hb_vector_size_impl_t) - 1) / sizeof (hb_vector_size_impl_t)] = {};
 /*thread_local*/ hb_vector_size_impl_t _hb_CrapPool[(HB_NULL_POOL_SIZE + sizeof (hb_vector_size_impl_t) - 1) / sizeof (hb_vector_size_impl_t)] = {};