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

[subset] Fix check-symbols failure 

Fixes https://github.com/harfbuzz/harfbuzz/issues/3850
This commit is contained in:
Behdad Esfahbod 2022-10-20 17:13:26 -06:00
parent 970321db7b
commit b0b7a65388
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/check-symbols.py
View File

@ -31,7 +31,7 @@ for soname in ['harfbuzz', 'harfbuzz-subset', 'harfbuzz-icu', 'harfbuzz-gobject'
symprefix = '_' if suffix == 'dylib' else '' symprefix = '_' if suffix == 'dylib' else ''
EXPORTED_SYMBOLS = [s.split ()[2] EXPORTED_SYMBOLS = [s.split ()[2]
for s in re.findall (r'^.+ [BCDGIRST] .+$', subprocess.check_output (nm.split() + [so]).decode ('utf-8'), re.MULTILINE) for s in re.findall (r'^.+ [BCDGIRSTu] .+$', subprocess.check_output (nm.split() + [so]).decode ('utf-8'), re.MULTILINE)
if not re.match (r'.* %s(%s)\b' % (symprefix, IGNORED_SYMBOLS), s)] if not re.match (r'.* %s(%s)\b' % (symprefix, IGNORED_SYMBOLS), s)]
# run again c++filt also if is available # run again c++filt also if is available

5
src/hb-subset-accelerator.hh
View File

@ -33,12 +33,13 @@
#include "hb-map.hh" #include "hb-map.hh"
#include "hb-set.hh" #include "hb-set.hh"
extern HB_INTERNAL hb_user_data_key_t _hb_subset_accelerator_user_data_key;
struct hb_subset_accelerator_t struct hb_subset_accelerator_t
{ {
static hb_user_data_key_t* user_data_key() static hb_user_data_key_t* user_data_key()
{ {
static hb_user_data_key_t key; return &_hb_subset_accelerator_user_data_key;
return &key;
} }
static hb_subset_accelerator_t* create(const hb_map_t& unicode_to_gid_, static hb_subset_accelerator_t* create(const hb_map_t& unicode_to_gid_,

4
src/hb-subset.cc
View File

@ -82,6 +82,10 @@ using OT::Layout::GPOS;
* retain glyph ids option and configure the subset to pass through the layout tables untouched. * retain glyph ids option and configure the subset to pass through the layout tables untouched.
*/ */
hb_user_data_key_t _hb_subset_accelerator_user_data_key = {};
/* /*
* The list of tables in the open type spec. Used to check for tables that may need handling * The list of tables in the open type spec. Used to check for tables that may need handling
* if we are unable to list the tables in a face. * if we are unable to list the tables in a face.