From 262eced2adae740de7dd7bcbb4359e892471536b Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 20 Apr 2020 12:17:28 -0700 Subject: [PATCH] [subset] FeatureVariations subsetting is wrong Never drop FeatureVariationRecord for now. Fixes https://github.com/harfbuzz/harfbuzz/issues/2334 --- src/hb-ot-layout-common.hh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh index 8b628a1b8..4e15dfbd8 100644 --- a/src/hb-ot-layout-common.hh +++ b/src/hb-ot-layout-common.hh @@ -2709,10 +2709,9 @@ struct FeatureVariationRecord auto *out = c->subset_context->serializer->embed (this); if (unlikely (!out)) return_trace (false); - bool ret = out->substitutions.serialize_subset (c->subset_context, substitutions, base, c); - if (unlikely (!ret)) return_trace (false); - out->conditions.serialize_subset (c->subset_context, conditions, base); + out->substitutions.serialize_subset (c->subset_context, substitutions, base, c); + return_trace (true); }