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

[subset] For retain gids don't truncate glyphs past the highest requested subset glyph.

This commit is contained in:
Garret Rieger 2019-01-28 18:10:56 -08:00
parent 490d52f908
commit 198859bb37
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hb-subset-plan.cc
View File

@ -156,7 +156,8 @@ _populate_gids_to_retain (hb_face_t *face,
} }
static void static void
_create_old_gid_to_new_gid_map (bool retain_gids, _create_old_gid_to_new_gid_map (const hb_face_t *face,
bool retain_gids,
const hb_vector_t<hb_codepoint_t> &glyphs, const hb_vector_t<hb_codepoint_t> &glyphs,
hb_map_t *glyph_map, /* OUT */ hb_map_t *glyph_map, /* OUT */
hb_map_t *reverse_glyph_map, /* OUT */ hb_map_t *reverse_glyph_map, /* OUT */
@ -180,7 +181,7 @@ _create_old_gid_to_new_gid_map (bool retain_gids,
} }
else else
{ {
*num_glyphs = glyphs[glyphs.length - 1] + 1; *num_glyphs = face->get_num_glyphs ();
} }
} }
@ -217,7 +218,8 @@ hb_subset_plan_create (hb_face_t *face,
plan->codepoint_to_glyph, plan->codepoint_to_glyph,
&plan->glyphs_deprecated); &plan->glyphs_deprecated);
_create_old_gid_to_new_gid_map (input->retain_gids, _create_old_gid_to_new_gid_map (face,
input->retain_gids,
plan->glyphs_deprecated, plan->glyphs_deprecated,
plan->glyph_map, plan->glyph_map,
plan->reverse_glyph_map, plan->reverse_glyph_map,