[subset-plan] Simplify name_languages allocation

pull/4027/head
Behdad Esfahbod 2 years ago
parent e4ca0fe436
commit cfb48f91da
  1. 2
      src/hb-subset-plan.cc
  2. 3
      src/hb-subset-plan.hh

@ -843,7 +843,7 @@ hb_subset_plan_create_or_fail (hb_face_t *face,
plan->unicode_to_new_gid_list.init (); plan->unicode_to_new_gid_list.init ();
plan->name_ids = hb_set_copy (input->sets.name_ids); plan->name_ids = hb_set_copy (input->sets.name_ids);
plan->name_languages = hb_set_copy (input->sets.name_languages); plan->name_languages = *input->sets.name_languages;
plan->layout_features = *input->sets.layout_features; plan->layout_features = *input->sets.layout_features;
plan->layout_scripts = *input->sets.layout_scripts; plan->layout_scripts = *input->sets.layout_scripts;
plan->glyphs_requested = hb_set_copy (input->sets.glyphs); plan->glyphs_requested = hb_set_copy (input->sets.glyphs);

@ -50,7 +50,6 @@ struct hb_subset_plan_t
{ {
hb_set_destroy (unicodes); hb_set_destroy (unicodes);
hb_set_destroy (name_ids); hb_set_destroy (name_ids);
hb_set_destroy (name_languages);
hb_set_destroy (glyphs_requested); hb_set_destroy (glyphs_requested);
hb_set_destroy (drop_tables); hb_set_destroy (drop_tables);
hb_set_destroy (no_subset_tables); hb_set_destroy (no_subset_tables);
@ -119,7 +118,7 @@ struct hb_subset_plan_t
hb_set_t *name_ids; hb_set_t *name_ids;
// name_languages we would like to retain // name_languages we would like to retain
hb_set_t *name_languages; hb_set_t name_languages;
//layout features which will be preserved //layout features which will be preserved
hb_set_t layout_features; hb_set_t layout_features;

Loading…
Cancel
Save