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

[subset] Pass plan through to collect methods. 

Allows to more easily access the filtering sets as they are added and enables propagating errors to the plan.
This commit is contained in:
Garret Rieger 2022-06-30 20:14:29 +00:00
parent 1bf051ef3b
commit e5c8a2f4e1
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,28 +124,25 @@ static bool _filter_tag_list(hb_vector_t<hb_tag_t>* tags, /* IN/OUT */
} }
template <typename T> template <typename T>
static void _collect_layout_indices (hb_face_t *face, static void _collect_layout_indices (hb_subset_plan_t *plan,
const T& table, const T& table,
const hb_set_t *layout_features_to_retain,
layout_collect_func_t layout_collect_func, layout_collect_func_t layout_collect_func,
hb_set_t *indices /* OUT */) hb_set_t *indices /* OUT */)
{ {
unsigned num_features = table.get_feature_count () + 1; unsigned num_features = table.get_feature_count () + 1;
hb_vector_t<hb_tag_t> features; hb_vector_t<hb_tag_t> features;
// TODO(garretrieger): propagate error to plan if (!plan->check_success (features.resize (num_features))) return;
if (!features.resize (num_features)) return;
table.get_feature_tags (0, &num_features, features.arrayZ); table.get_feature_tags (0, &num_features, features.arrayZ);
features.resize (num_features); features.resize (num_features);
bool retain_all_features = !_filter_tag_list (&features, layout_features_to_retain); bool retain_all_features = !_filter_tag_list (&features, plan->layout_features);
// TODO(garretrieger): propagate error to plan if (!plan->check_success (!features.in_error ()) || !features)
if (features.in_error () || !features)
return; return;
if (retain_all_features) if (retain_all_features)
{ {
// Looking for all features, trigger the faster collection method. // Looking for all features, trigger the faster collection method.
layout_collect_func (face, layout_collect_func (plan->source,
T::tableTag, T::tableTag,
nullptr, nullptr,
nullptr, nullptr,
@ -156,7 +153,7 @@ static void _collect_layout_indices (hb_face_t *face,
// The collect function needs a null element to signal end of the array. // The collect function needs a null element to signal end of the array.
features.push (0); features.push (0);
layout_collect_func (face, layout_collect_func (plan->source,
T::tableTag, T::tableTag,
nullptr, nullptr,
nullptr, nullptr,
@ -166,36 +163,33 @@ static void _collect_layout_indices (hb_face_t *face,
template <typename T> template <typename T>
static inline void static inline void
_closure_glyphs_lookups_features (hb_face_t *face, _closure_glyphs_lookups_features (hb_subset_plan_t *plan,
hb_set_t *gids_to_retain, hb_set_t *gids_to_retain,
const hb_set_t *layout_features_to_retain,
hb_map_t *lookups, hb_map_t *lookups,
hb_map_t *features, hb_map_t *features,
script_langsys_map *langsys_map) script_langsys_map *langsys_map)
{ {
hb_blob_ptr_t<T> table = hb_sanitize_context_t ().reference_table<T> (face); hb_blob_ptr_t<T> table = hb_sanitize_context_t ().reference_table<T> (plan->source);
hb_tag_t table_tag = table->tableTag; hb_tag_t table_tag = table->tableTag;
hb_set_t lookup_indices; hb_set_t lookup_indices;
_collect_layout_indices<T> (face, _collect_layout_indices<T> (plan,
*table, *table,
layout_features_to_retain,
hb_ot_layout_collect_lookups, hb_ot_layout_collect_lookups,
&lookup_indices); &lookup_indices);
if (table_tag == HB_OT_TAG_GSUB) if (table_tag == HB_OT_TAG_GSUB)
hb_ot_layout_lookups_substitute_closure (face, hb_ot_layout_lookups_substitute_closure (plan->source,
&lookup_indices, &lookup_indices,
gids_to_retain); gids_to_retain);
table->closure_lookups (face, table->closure_lookups (plan->source,
gids_to_retain, gids_to_retain,
&lookup_indices); &lookup_indices);
_remap_indexes (&lookup_indices, lookups); _remap_indexes (&lookup_indices, lookups);
// Collect and prune features // Collect and prune features
hb_set_t feature_indices; hb_set_t feature_indices;
_collect_layout_indices<T> (face, _collect_layout_indices<T> (plan,
*table, *table,
layout_features_to_retain,
hb_ot_layout_collect_features, hb_ot_layout_collect_features,
&feature_indices); &feature_indices);
@ -412,18 +406,16 @@ _populate_gids_to_retain (hb_subset_plan_t* plan,
if (close_over_gsub) if (close_over_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->source, plan,
plan->_glyphset_gsub, plan->_glyphset_gsub,
plan->layout_features,
plan->gsub_lookups, plan->gsub_lookups,
plan->gsub_features, plan->gsub_features,
plan->gsub_langsys); plan->gsub_langsys);
if (close_over_gpos) if (close_over_gpos)
_closure_glyphs_lookups_features<GPOS> ( _closure_glyphs_lookups_features<GPOS> (
plan->source, plan,
plan->_glyphset_gsub, plan->_glyphset_gsub,
plan->layout_features,
plan->gpos_lookups, plan->gpos_lookups,
plan->gpos_features, plan->gpos_features,
plan->gpos_langsys); plan->gpos_langsys);