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

[subset-plan] Simplify layout_features allocation

This commit is contained in:
Behdad Esfahbod 2023-01-11 10:43:01 -07:00
parent 4de66eec57
commit e4ca0fe436
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,7 +139,7 @@ static void _collect_layout_indices (hb_subset_plan_t *plan,
hb_vector_t<hb_tag_t> features;
if (!plan->check_success (features.resize (num_features))) return;
table.get_feature_tags (0, &num_features, features.arrayZ);
bool retain_all_features = !_filter_tag_list (&features, plan->layout_features);
bool retain_all_features = !_filter_tag_list (&features, &plan->layout_features);
unsigned num_scripts = table.get_script_count ();
hb_vector_t<hb_tag_t> scripts;
@ -844,7 +844,7 @@ hb_subset_plan_create_or_fail (hb_face_t *face,
plan->name_ids = hb_set_copy (input->sets.name_ids);
plan->name_languages = hb_set_copy (input->sets.name_languages);
plan->layout_features = hb_set_copy (input->sets.layout_features);
plan->layout_features = *input->sets.layout_features;
plan->layout_scripts = *input->sets.layout_scripts;
plan->glyphs_requested = hb_set_copy (input->sets.glyphs);
plan->drop_tables = hb_set_copy (input->sets.drop_tables);

3
src/hb-subset-plan.hh
View File

@ -51,7 +51,6 @@ struct hb_subset_plan_t
hb_set_destroy (unicodes);
hb_set_destroy (name_ids);
hb_set_destroy (name_languages);
hb_set_destroy (layout_features);
hb_set_destroy (glyphs_requested);
hb_set_destroy (drop_tables);
hb_set_destroy (no_subset_tables);
@ -123,7 +122,7 @@ struct hb_subset_plan_t
hb_set_t *name_languages;
//layout features which will be preserved
hb_set_t *layout_features;
hb_set_t layout_features;
// layout scripts which will be preserved.
hb_set_t layout_scripts;