From 7d7b49234441144692a69577b7c7ed70611c9ebc Mon Sep 17 00:00:00 2001 From: Qunxin Liu Date: Wed, 24 Aug 2022 11:49:50 -0700 Subject: [PATCH] [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 --- src/hb-subset-plan.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc index 4faca1ee9..c34f6722b 100644 --- a/src/hb-subset-plan.cc +++ b/src/hb-subset-plan.cc @@ -759,6 +759,10 @@ hb_subset_plan_create_or_fail (hb_face_t *face, return nullptr; } +#ifndef HB_NO_VAR + _normalize_axes_location (face, plan); +#endif + _populate_unicodes_to_retain (input->sets.unicodes, input->sets.glyphs, 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); } -#ifndef HB_NO_VAR - _normalize_axes_location (face, plan); -#endif - _nameid_closure (face, plan->name_ids, plan->all_axes_pinned, plan->user_axes_location); if (unlikely (plan->in_error ())) { hb_subset_plan_destroy (plan);