From 157a414bd9fb8b1b7a066603e7c44b8680b48e28 Mon Sep 17 00:00:00 2001 From: Michiharu Ariza Date: Thu, 2 May 2019 11:25:10 -0700 Subject: [PATCH] fix mixup of TRACE_SUBSET/SERIALIZE --- src/hb-ot-layout-common.hh | 4 ++-- src/hb-ot-var-hvar-table.hh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh index aaf9aa954..ea01c5a5e 100644 --- a/src/hb-ot-layout-common.hh +++ b/src/hb-ot-layout-common.hh @@ -1781,7 +1781,7 @@ struct VarData const hb_bimap_t &inner_map, const hb_bimap_t ®ion_map) { - TRACE_SUBSET (this); + TRACE_SERIALIZE (this); if (unlikely (!c->extend_min (*this))) return_trace (false); itemCount = inner_map.get_count (); @@ -1929,7 +1929,7 @@ struct VariationStore const VariationStore *src, const hb_array_t &inner_remaps) { - TRACE_SUBSET (this); + TRACE_SERIALIZE (this); unsigned int set_count = 0; for (unsigned int i = 0; i < inner_remaps.length; i++) if (inner_remaps[i].get_count () > 0) set_count++; diff --git a/src/hb-ot-var-hvar-table.hh b/src/hb-ot-var-hvar-table.hh index ff2cf343d..49f241c3f 100644 --- a/src/hb-ot-var-hvar-table.hh +++ b/src/hb-ot-var-hvar-table.hh @@ -328,7 +328,7 @@ struct HVARVVAR bool serialize_index_maps (hb_serialize_context_t *c, const hb_array_t &im_plans) { - TRACE_SUBSET (this); + TRACE_SERIALIZE (this); if (im_plans[index_map_subset_plan_t::ADV_INDEX].is_identity ()) advMap = 0; else if (unlikely (!advMap.serialize (c, this).serialize (c, im_plans[index_map_subset_plan_t::ADV_INDEX]))) @@ -426,7 +426,7 @@ struct VVAR : HVARVVAR { bool serialize_index_maps (hb_serialize_context_t *c, const hb_array_t &im_plans) { - TRACE_SUBSET (this); + TRACE_SERIALIZE (this); if (unlikely (!HVARVVAR::serialize_index_maps (c, im_plans))) return_trace (false); if (!im_plans[index_map_subset_plan_t::VORG_INDEX].get_map_count ())