retain FDSelect & FDArray with --retain-gids

so in sync with fonttools behavior
pull/1583/head
Michiharu Ariza 6 years ago
parent a5fa76977b
commit e2856c2d85
  1. 12
      src/hb-subset-cff-common.cc
  2. BIN
      test/api/fonts/SourceHanSans-Regular.41,4C2E.retaingids.otf

@ -66,21 +66,17 @@ hb_plan_subset_cff_fdselect (const hb_subset_plan_t *plan,
hb_set_t *set = hb_set_create ();
if (set == &Null (hb_set_t))
return false;
hb_codepoint_t prev_fd = 0;
hb_codepoint_t prev_fd = CFF_UNDEF_CODE;
for (hb_codepoint_t i = 0; i < subset_num_glyphs; i++)
{
hb_codepoint_t glyph;
hb_codepoint_t fd;
if (!plan->old_gid_for_new_gid (i, &glyph))
{
/* for a missing glyph, use the same fd as the previous
* as an attempt to minimize the number of ranges */
fd = prev_fd;
}
else
{
fd = src.get_fd (glyph);
/* fonttools retains FDSelect & font dicts for missing glyphs. do the same */
glyph = i;
}
fd = src.get_fd (glyph);
set->add (fd);
if (fd != prev_fd)

Loading…
Cancel
Save