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

[subset-cff2] Don't encode vsindex if pinned

This commit is contained in:
Behdad Esfahbod 2023-02-19 10:51:55 -07:00
parent a88f3e8d37
commit 82d9940a93
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -738,7 +738,7 @@ struct subr_subsetter_t
return true; return true;
} }
bool encode_charstrings (str_buff_vec_t &buffArray) const bool encode_charstrings (str_buff_vec_t &buffArray, bool encode_prefix = true) const
{ {
if (unlikely (!buffArray.resize_exact (plan->num_output_glyphs ()))) if (unlikely (!buffArray.resize_exact (plan->num_output_glyphs ())))
return false; return false;
@ -754,7 +754,7 @@ struct subr_subsetter_t
unsigned int fd = acc.fdSelect->get_fd (glyph); unsigned int fd = acc.fdSelect->get_fd (glyph);
if (unlikely (fd >= acc.fdCount)) if (unlikely (fd >= acc.fdCount))
return false; return false;
if (unlikely (!encode_str (get_parsed_charstring (i), fd, buffArray.arrayZ[i]))) if (unlikely (!encode_str (get_parsed_charstring (i), fd, buffArray.arrayZ[i], encode_prefix)))
return false; return false;
} }
return true; return true;
@ -984,14 +984,14 @@ struct subr_subsetter_t
} }
} }
bool encode_str (const parsed_cs_str_t &str, const unsigned int fd, str_buff_t &buff) const bool encode_str (const parsed_cs_str_t &str, const unsigned int fd, str_buff_t &buff, bool encode_prefix = true) const
{ {
str_encoder_t encoder (buff); str_encoder_t encoder (buff);
encoder.reset (); encoder.reset ();
bool hinting = !(plan->flags & HB_SUBSET_FLAGS_NO_HINTING); bool hinting = !(plan->flags & HB_SUBSET_FLAGS_NO_HINTING);
/* if a prefix (CFF1 width or CFF2 vsindex) has been removed along with hints, /* if a prefix (CFF1 width or CFF2 vsindex) has been removed along with hints,
* re-insert it at the beginning of charstreing */ * re-insert it at the beginning of charstreing */
if (str.has_prefix () && !hinting && str.is_hint_dropped ()) if (encode_prefix && str.has_prefix () && !hinting && str.is_hint_dropped ())
{ {
encoder.encode_num (str.prefix_num ()); encoder.encode_num (str.prefix_num ());
if (str.prefix_op () != OpCode_Invalid) if (str.prefix_op () != OpCode_Invalid)

2
src/hb-subset-cff2.cc
View File

@ -272,7 +272,7 @@ struct cff2_subset_plan
return false; return false;
/* encode charstrings, global subrs, local subrs with new subroutine numbers */ /* encode charstrings, global subrs, local subrs with new subroutine numbers */
if (!subr_subsetter.encode_charstrings (subset_charstrings)) if (!subr_subsetter.encode_charstrings (subset_charstrings, !pinned))
return false; return false;
if (!subr_subsetter.encode_globalsubrs (subset_globalsubrs)) if (!subr_subsetter.encode_globalsubrs (subset_globalsubrs))