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

[subset] Skip glyph closure for any dropped table 

If COLR or MATH tables are being dropped, there is no point in closing
glyphs over them, just like it is done for GSUB.
This commit is contained in:
Khaled Hosny 2022-09-19 10:40:49 +02:00 committed by Behdad Esfahbod
parent 4a1d891c63
commit d827a5ee40
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -509,9 +509,7 @@ _glyf_add_gid_and_children (const OT::glyf_accelerator_t &glyf,
static void static void
_populate_gids_to_retain (hb_subset_plan_t* plan, _populate_gids_to_retain (hb_subset_plan_t* plan,
bool close_over_gsub, hb_set_t* drop_tables)
bool close_over_gpos,
bool close_over_gdef)
{ {
OT::glyf_accelerator_t glyf (plan->source); OT::glyf_accelerator_t glyf (plan->source);
#ifndef HB_NO_SUBSET_CFF #ifndef HB_NO_SUBSET_CFF
@ -523,7 +521,7 @@ _populate_gids_to_retain (hb_subset_plan_t* plan,
_cmap_closure (plan->source, plan->unicodes, plan->_glyphset_gsub); _cmap_closure (plan->source, plan->unicodes, plan->_glyphset_gsub);
#ifndef HB_NO_SUBSET_LAYOUT #ifndef HB_NO_SUBSET_LAYOUT
if (close_over_gsub) if (!drop_tables->has (HB_OT_TAG_GSUB))
// closure all glyphs/lookups/features needed for GSUB substitutions. // closure all glyphs/lookups/features needed for GSUB substitutions.
_closure_glyphs_lookups_features<GSUB> ( _closure_glyphs_lookups_features<GSUB> (
plan, plan,
@ -532,7 +530,7 @@ _populate_gids_to_retain (hb_subset_plan_t* plan,
plan->gsub_features, plan->gsub_features,
plan->gsub_langsys); plan->gsub_langsys);
if (close_over_gpos) if (!drop_tables->has (HB_OT_TAG_GPOS))
_closure_glyphs_lookups_features<GPOS> ( _closure_glyphs_lookups_features<GPOS> (
plan, plan,
plan->_glyphset_gsub, plan->_glyphset_gsub,
@ -543,12 +541,18 @@ _populate_gids_to_retain (hb_subset_plan_t* plan,
_remove_invalid_gids (plan->_glyphset_gsub, plan->source->get_num_glyphs ()); _remove_invalid_gids (plan->_glyphset_gsub, plan->source->get_num_glyphs ());
hb_set_set (plan->_glyphset_mathed, plan->_glyphset_gsub); hb_set_set (plan->_glyphset_mathed, plan->_glyphset_gsub);
_math_closure (plan, plan->_glyphset_mathed); if (!drop_tables->has (HB_OT_TAG_MATH))
_remove_invalid_gids (plan->_glyphset_mathed, plan->source->get_num_glyphs ()); {
_math_closure (plan, plan->_glyphset_mathed);
_remove_invalid_gids (plan->_glyphset_mathed, plan->source->get_num_glyphs ());
}
hb_set_t cur_glyphset = *plan->_glyphset_mathed; hb_set_t cur_glyphset = *plan->_glyphset_mathed;
_colr_closure (plan->source, plan->colrv1_layers, plan->colr_palettes, &cur_glyphset); if (!drop_tables->has (HB_OT_TAG_COLR))
_remove_invalid_gids (&cur_glyphset, plan->source->get_num_glyphs ()); {
_colr_closure (plan->source, plan->colrv1_layers, plan->colr_palettes, &cur_glyphset);
_remove_invalid_gids (&cur_glyphset, plan->source->get_num_glyphs ());
}
hb_set_set (plan->_glyphset_colred, &cur_glyphset); hb_set_set (plan->_glyphset_colred, &cur_glyphset);
@ -570,7 +574,7 @@ _populate_gids_to_retain (hb_subset_plan_t* plan,
#ifndef HB_NO_VAR #ifndef HB_NO_VAR
if (close_over_gdef) if (!drop_tables->has (HB_OT_TAG_GDEF))
_collect_layout_variation_indices (plan); _collect_layout_variation_indices (plan);
#endif #endif
} }
@ -768,10 +772,7 @@ hb_subset_plan_create_or_fail (hb_face_t *face,
_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, input->sets.drop_tables);
!input->sets.drop_tables->has (HB_OT_TAG_GSUB),
!input->sets.drop_tables->has (HB_OT_TAG_GPOS),
!input->sets.drop_tables->has (HB_OT_TAG_GDEF));
_create_old_gid_to_new_gid_map (face, _create_old_gid_to_new_gid_map (face,
input->flags & HB_SUBSET_FLAGS_RETAIN_GIDS, input->flags & HB_SUBSET_FLAGS_RETAIN_GIDS,