From 8d5c899b0ff43b4b8aeb767623627cf55168c8fb Mon Sep 17 00:00:00 2001 From: Garret Rieger Date: Fri, 25 Nov 2022 20:33:39 +0000 Subject: [PATCH] [subset] In cff accelerator hold reference to CFF table instead of the whole font. --- src/hb-ot-cff1-table.hh | 2 +- src/hb-ot-cff2-table.hh | 2 +- src/hb-subset-cff-common.hh | 19 ++++++++++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/hb-ot-cff1-table.hh b/src/hb-ot-cff1-table.hh index 1d39ffe55..54ef270bc 100644 --- a/src/hb-ot-cff1-table.hh +++ b/src/hb-ot-cff1-table.hh @@ -1295,10 +1295,10 @@ struct cff1 } protected: - hb_blob_t *blob = nullptr; hb_sanitize_context_t sc; public: + hb_blob_t *blob = nullptr; const Encoding *encoding = nullptr; const Charset *charset = nullptr; const CFF1NameIndex *nameIndex = nullptr; diff --git a/src/hb-ot-cff2-table.hh b/src/hb-ot-cff2-table.hh index 474ebb0fb..e84709fa7 100644 --- a/src/hb-ot-cff2-table.hh +++ b/src/hb-ot-cff2-table.hh @@ -486,10 +486,10 @@ struct cff2 bool is_valid () const { return blob; } protected: - hb_blob_t *blob = nullptr; hb_sanitize_context_t sc; public: + hb_blob_t *blob = nullptr; cff2_top_dict_values_t topDict; const CFF2Subrs *globalSubrs = nullptr; const CFF2VariationStore *varStore = nullptr; diff --git a/src/hb-subset-cff-common.hh b/src/hb-subset-cff-common.hh index 0286c7ff4..f41e6589d 100644 --- a/src/hb-subset-cff-common.hh +++ b/src/hb-subset-cff-common.hh @@ -405,13 +405,13 @@ struct parsed_cs_str_vec_t : hb_vector_t struct cff_subset_accelerator_t { static cff_subset_accelerator_t* create ( - hb_face_t* original_face, + hb_blob_t* original_blob, const parsed_cs_str_vec_t& parsed_charstrings, const parsed_cs_str_vec_t& parsed_global_subrs, const hb_vector_t& parsed_local_subrs) { cff_subset_accelerator_t* accel = (cff_subset_accelerator_t*) hb_malloc (sizeof(cff_subset_accelerator_t)); - new (accel) cff_subset_accelerator_t (original_face, + new (accel) cff_subset_accelerator_t (original_blob, parsed_charstrings, parsed_global_subrs, parsed_local_subrs); @@ -427,21 +427,22 @@ struct cff_subset_accelerator_t } cff_subset_accelerator_t( - hb_face_t* original_face_, + hb_blob_t* original_blob_, const parsed_cs_str_vec_t& parsed_charstrings_, const parsed_cs_str_vec_t& parsed_global_subrs_, const hb_vector_t& parsed_local_subrs_) { - // the parsed charstrings point to memory in the original face so we must hold a reference - // to it to keep the memory valid. - original_face = hb_face_reference (original_face_); parsed_charstrings = parsed_charstrings_; parsed_global_subrs = parsed_global_subrs_; parsed_local_subrs = parsed_local_subrs_; + + // the parsed charstrings point to memory in the original CFF table so we must hold a reference + // to it to keep the memory valid. + original_blob = hb_blob_reference (original_blob_); } ~cff_subset_accelerator_t() { - hb_face_destroy (original_face); + hb_blob_destroy (original_blob); } parsed_cs_str_vec_t parsed_charstrings; @@ -449,7 +450,7 @@ struct cff_subset_accelerator_t hb_vector_t parsed_local_subrs; private: - hb_face_t* original_face; + hb_blob_t* original_blob; }; struct subr_subset_param_t @@ -1021,7 +1022,7 @@ struct subr_subsetter_t if (!plan->inprogress_accelerator) return; plan->inprogress_accelerator->cff_accelerator = - cff_subset_accelerator_t::create(plan->source, + cff_subset_accelerator_t::create(acc.blob, parsed_charstrings, parsed_global_subrs, parsed_local_subrs);