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

[instance] move _normalize_axes_location to the beginning of 

subset_plan_create

pinned_at_default flag decides whether delta will be collected as well
when collecting layout variation indices
This commit is contained in:
Qunxin Liu 2022-08-24 11:49:50 -07:00
parent 6de0a6f0b7
commit 7d7b492344
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hb-subset-plan.cc
View File

@ -759,6 +759,10 @@ hb_subset_plan_create_or_fail (hb_face_t *face,
return nullptr; return nullptr;
} }
#ifndef HB_NO_VAR
_normalize_axes_location (face, plan);
#endif
_populate_unicodes_to_retain (input->sets.unicodes, input->sets.glyphs, plan); _populate_unicodes_to_retain (input->sets.unicodes, input->sets.glyphs, plan);
_populate_gids_to_retain (plan, _populate_gids_to_retain (plan,
@ -786,10 +790,6 @@ hb_subset_plan_create_or_fail (hb_face_t *face,
plan->glyph_map->get(plan->unicode_to_new_gid_list.arrayZ[i].second); plan->glyph_map->get(plan->unicode_to_new_gid_list.arrayZ[i].second);
} }
#ifndef HB_NO_VAR
_normalize_axes_location (face, plan);
#endif
_nameid_closure (face, plan->name_ids, plan->all_axes_pinned, plan->user_axes_location); _nameid_closure (face, plan->name_ids, plan->all_axes_pinned, plan->user_axes_location);
if (unlikely (plan->in_error ())) { if (unlikely (plan->in_error ())) {
hb_subset_plan_destroy (plan); hb_subset_plan_destroy (plan);