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

[subset] Cache parsed charstrings in the cff accelerator.

This commit is contained in:
Garret Rieger 2022-11-23 21:02:39 +00:00
parent 48b6837074
commit 47c125845c
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/hb-subset-cff-common.hh
View File

@ -404,10 +404,15 @@ struct parsed_cs_str_vec_t : hb_vector_t<parsed_cs_str_t>
struct cff_subset_accelerator_t
{
static cff_subset_accelerator_t* create() {
static cff_subset_accelerator_t* create(
const parsed_cs_str_vec_t& parsed_charstrings,
const parsed_cs_str_vec_t& parsed_global_subrs,
const hb_vector_t<parsed_cs_str_vec_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 ();
new (accel) cff_subset_accelerator_t (parsed_charstrings,
parsed_global_subrs,
parsed_local_subrs);
return accel;
}
@ -419,9 +424,20 @@ struct cff_subset_accelerator_t
hb_free (accel);
}
parsed_cs_str_t parsed_charstring;
cff_subset_accelerator_t(
const parsed_cs_str_vec_t& parsed_charstrings_,
const parsed_cs_str_vec_t& parsed_global_subrs_,
const hb_vector_t<parsed_cs_str_vec_t>& parsed_local_subrs_)
{
parsed_charstrings = parsed_charstrings_;
parsed_global_subrs = parsed_global_subrs_;
parsed_local_subrs = parsed_local_subrs_;
}
parsed_cs_str_vec_t parsed_charstrings;
parsed_cs_str_vec_t parsed_global_subrs;
parsed_cs_str_vec_t parsed_local_subrs;
hb_vector_t<parsed_cs_str_vec_t> parsed_local_subrs;
};
struct subr_subset_param_t
@ -666,6 +682,7 @@ struct subr_subsetter_t
remaps.create (closures);
populate_subset_accelerator();
return true;
}
@ -926,6 +943,17 @@ struct subr_subsetter_t
return !encoder.is_error ();
}
void populate_subset_accelerator() const
{
if (!plan->inprogress_accelerator) return;
plan->inprogress_accelerator->cff_accelerator =
cff_subset_accelerator_t::create(parsed_charstrings,
parsed_global_subrs,
parsed_local_subrs);
}
protected:
const ACC &acc;
const hb_subset_plan_t *plan;