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

[subset] don't drop features referenced in a feature variation substitution.

This commit is contained in:
Garret Rieger 2021-03-25 12:57:12 -07:00
parent dae99b7769
commit f0c78e0282
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/hb-ot-layout-common.hh
View File

@ -1108,7 +1108,7 @@ struct Feature
auto *out = c->serializer->start_embed (*this); auto *out = c->serializer->start_embed (*this);
if (unlikely (!out || !c->serializer->extend_min (out))) return_trace (false); if (unlikely (!out || !c->serializer->extend_min (out))) return_trace (false);
bool subset_featureParams = out->featureParams.serialize_subset (c, featureParams, this, tag); out->featureParams.serialize_subset (c, featureParams, this, tag);
auto it = auto it =
+ hb_iter (lookupIndex) + hb_iter (lookupIndex)
@ -1117,8 +1117,9 @@ struct Feature
; ;
out->lookupIndex.serialize (c->serializer, l, it); out->lookupIndex.serialize (c->serializer, l, it);
return_trace (bool (it) || subset_featureParams // The decision to keep or drop this feature is already made before we get here
|| (tag && *tag == HB_TAG ('p', 'r', 'e', 'f'))); // so always retain it.
return_trace (true);
} }
bool sanitize (hb_sanitize_context_t *c, bool sanitize (hb_sanitize_context_t *c,
@ -3001,6 +3002,12 @@ struct FeatureTableSubstitutionRecord
bool subset (hb_subset_layout_context_t *c, const void *base) const bool subset (hb_subset_layout_context_t *c, const void *base) const
{ {
TRACE_SUBSET (this); TRACE_SUBSET (this);
if (!c->feature_index_map->has (featureIndex)) {
// Feature that is being substituted is not being retained, so we don't
// need this.
return_trace (false);
}
auto *out = c->subset_context->serializer->embed (this); auto *out = c->subset_context->serializer->embed (this);
if (unlikely (!out)) return_trace (false); if (unlikely (!out)) return_trace (false);