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

[cff-subset] Drop hints just after parsing charstring 

In prep for next commit.
This commit is contained in:
Behdad Esfahbod 2023-01-01 18:58:08 -07:00
parent b1c4cb0cae
commit a7617c3cf1
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -657,28 +657,10 @@ struct subr_subsetter_t
/* complete parsed string esp. copy CFF1 width or CFF2 vsindex to the parsed charstring for encoding */ /* complete parsed string esp. copy CFF1 width or CFF2 vsindex to the parsed charstring for encoding */
SUBSETTER::complete_parsed_str (interp.env, param, parsed_charstrings[i]); SUBSETTER::complete_parsed_str (interp.env, param, parsed_charstrings[i]);
}
// Since parsed strings were loaded from accelerator, we still need
// to compute the subroutine closures which would have normally happened during
// parsing.
if (cff_accelerator &&
!closure_subroutines(*parsed_global_subrs,
*parsed_local_subrs))
return false;
if ((plan->flags & HB_SUBSET_FLAGS_NO_HINTING && !cff_accelerator) ||
plan->inprogress_accelerator)
{
/* mark hint ops and arguments for drop */ /* mark hint ops and arguments for drop */
for (unsigned int i = 0; i < plan->num_output_glyphs (); i++) if ((plan->flags & HB_SUBSET_FLAGS_NO_HINTING) || plan->inprogress_accelerator)
{ {
hb_codepoint_t glyph;
if (!plan->old_gid_for_new_gid (i, &glyph))
continue;
unsigned int fd = acc.fdSelect->get_fd (glyph);
if (unlikely (fd >= acc.fdCount))
return false;
subr_subset_param_t param (&parsed_charstrings[i], subr_subset_param_t param (&parsed_charstrings[i],
&parsed_global_subrs_storage, &parsed_global_subrs_storage,
&parsed_local_subrs_storage[fd], &parsed_local_subrs_storage[fd],
@ -694,13 +676,19 @@ struct subr_subsetter_t
parsed_charstrings[i].set_vsindex_dropped (); parsed_charstrings[i].set_vsindex_dropped ();
} }
} }
/* after dropping hints recreate closures of actually used subrs */
if (plan->flags & HB_SUBSET_FLAGS_NO_HINTING &&
!cff_accelerator &&
!closure_subroutines(*parsed_global_subrs, *parsed_local_subrs)) return false;
} }
// Since parsed strings were loaded from accelerator, we still need
// to compute the subroutine closures which would have normally happened during
// parsing.
//
// Or if we are dropping hinting, redo closure to get actually used subrs.
if ((cff_accelerator ||
(!cff_accelerator && plan->flags & HB_SUBSET_FLAGS_NO_HINTING)) &&
!closure_subroutines(*parsed_global_subrs,
*parsed_local_subrs))
return false;
remaps.create (closures); remaps.create (closures);
populate_subset_accelerator (); populate_subset_accelerator ();