walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Qunxin Liu 2019-04-25 09:17:58 -07:00 committed by Garret Rieger
parent 2f6ec35344
commit 8c8922a019
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.sources
View File

@ -84,6 +84,7 @@ HB_BASE_sources = \
hb-ot-math-table.hh \ hb-ot-math-table.hh \
hb-ot-math.cc \ hb-ot-math.cc \
hb-ot-maxp-table.hh \ hb-ot-maxp-table.hh \
hb-ot-name-language-static.hh \
hb-ot-name-language.hh \ hb-ot-name-language.hh \
hb-ot-name-table.hh \ hb-ot-name-table.hh \
hb-ot-name.cc \ hb-ot-name.cc \

7
src/hb-ot-name-table.hh
View File

@ -187,8 +187,11 @@ struct name
} }
c->push<NameRecord> (); c->push<NameRecord> ();
if (!c->embed (source_name->nameRecordZ[idx]))
NameRecord *p = c->embed<NameRecord> (source_name->nameRecordZ[idx]);
if (!p)
return false; return false;
p->offset = 0;
} }
return true; return true;
@ -233,7 +236,7 @@ struct name
hb_serialize_context_t *c, hb_serialize_context_t *c,
unsigned length) 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--) for (int i = length-1; i >= 0; i--)
{ {
unsigned objidx = c->pop_pack (); unsigned objidx = c->pop_pack ();

3
src/hb-static.cc
View File

@ -36,9 +36,8 @@
#include "hb-ot-head-table.hh" #include "hb-ot-head-table.hh"
#include "hb-ot-maxp-table.hh" #include "hb-ot-maxp-table.hh"
#include "hb-ot-name-language-static.hh"
#ifndef HB_NO_VISIBILITY #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)] = {}; 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)] = {}; /*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)] = {};