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

[subset] Restore hb_face_data_destroy to be internal.

This commit is contained in:
Garret Rieger 2018-02-14 15:57:11 -08:00
parent 3ab7d2649b
commit e330ef3711
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hb-subset.cc
View File

@ -128,8 +128,8 @@ _hb_subset_face_data_create (void)
return data; return data;
} }
void static void
hb_subset_face_data_destroy (void *user_data) _hb_subset_face_data_destroy (void *user_data)
{ {
hb_subset_face_data_t *data = (hb_subset_face_data_t *) user_data; hb_subset_face_data_t *data = (hb_subset_face_data_t *) user_data;
@ -200,13 +200,13 @@ hb_subset_face_create (void)
return hb_face_create_for_tables (_hb_subset_face_reference_table, return hb_face_create_for_tables (_hb_subset_face_reference_table,
data, data,
hb_subset_face_data_destroy); _hb_subset_face_data_destroy);
} }
hb_bool_t hb_bool_t
hb_subset_face_add_table (hb_face_t *face, hb_tag_t tag, hb_blob_t *blob) hb_subset_face_add_table (hb_face_t *face, hb_tag_t tag, hb_blob_t *blob)
{ {
if (unlikely (face->destroy != hb_subset_face_data_destroy)) if (unlikely (face->destroy != _hb_subset_face_data_destroy))
return false; return false;
hb_subset_face_data_t *data = (hb_subset_face_data_t *) face->user_data; hb_subset_face_data_t *data = (hb_subset_face_data_t *) face->user_data;
@ -228,7 +228,7 @@ _add_head_and_set_loca_version (hb_face_t *source, bool use_short_loca, hb_face_
hb_bool_t has_head = (head != nullptr); hb_bool_t has_head = (head != nullptr);
if (has_head) { if (has_head) {
OT::head *head_prime = (OT::head *) calloc (OT::head::static_size, 1); OT::head *head_prime = (OT::head *) malloc (OT::head::static_size);
memcpy (head_prime, head, OT::head::static_size); memcpy (head_prime, head, OT::head::static_size);
head_prime->indexToLocFormat.set (use_short_loca ? 0 : 1); head_prime->indexToLocFormat.set (use_short_loca ? 0 : 1);