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

[subset] Update hb-subset-plan.cc to match hb-subset-plan.hh.

This commit is contained in:
Garret Rieger 2019-01-28 16:59:15 -08:00
parent 74c44ffeba
commit bdbe047d6c
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,21 +204,21 @@ hb_subset_plan_create (hb_face_t *face,
plan->drop_layout = input->drop_layout; plan->drop_layout = input->drop_layout;
plan->desubroutinize = input->desubroutinize; plan->desubroutinize = input->desubroutinize;
plan->unicodes = hb_set_create(); plan->unicodes = hb_set_create();
plan->glyphs.init(); plan->glyphs_deprecated.init();
plan->source = hb_face_reference (face); plan->source = hb_face_reference (face);
plan->dest = hb_face_builder_create (); plan->dest = hb_face_builder_create ();
plan->codepoint_to_glyph = hb_map_create(); plan->codepoint_to_glyph = hb_map_create();
plan->glyph_map = hb_map_create(); plan->glyph_map = hb_map_create();
plan->reverse_glyph_map = hb_map_create(); plan->reverse_glyph_map = hb_map_create();
plan->glyphset = _populate_gids_to_retain (face, plan->_glyphset = _populate_gids_to_retain (face,
input->unicodes, input->unicodes,
!plan->drop_layout, !plan->drop_layout,
plan->unicodes, plan->unicodes,
plan->codepoint_to_glyph, plan->codepoint_to_glyph,
&plan->glyphs); &plan->glyphs_deprecated);
_create_old_gid_to_new_gid_map (input->retain_gids, _create_old_gid_to_new_gid_map (input->retain_gids,
plan->glyphs, plan->glyphs_deprecated,
plan->glyph_map, plan->glyph_map,
plan->reverse_glyph_map, plan->reverse_glyph_map,
&plan->_num_output_glyphs); &plan->_num_output_glyphs);
@ -237,13 +237,13 @@ hb_subset_plan_destroy (hb_subset_plan_t *plan)
if (!hb_object_destroy (plan)) return; if (!hb_object_destroy (plan)) return;
hb_set_destroy (plan->unicodes); hb_set_destroy (plan->unicodes);
plan->glyphs.fini (); plan->glyphs_deprecated.fini ();
hb_face_destroy (plan->source); hb_face_destroy (plan->source);
hb_face_destroy (plan->dest); hb_face_destroy (plan->dest);
hb_map_destroy (plan->codepoint_to_glyph); hb_map_destroy (plan->codepoint_to_glyph);
hb_map_destroy (plan->glyph_map); hb_map_destroy (plan->glyph_map);
hb_map_destroy (plan->reverse_glyph_map); hb_map_destroy (plan->reverse_glyph_map);
hb_set_destroy (plan->glyphset); hb_set_destroy (plan->_glyphset);
free (plan); free (plan);
} }

1
src/hb-subset-plan.hh
View File

@ -60,7 +60,6 @@ struct hb_subset_plan_t
hb_face_t *source; hb_face_t *source;
hb_face_t *dest; hb_face_t *dest;
private:
unsigned int _num_output_glyphs; unsigned int _num_output_glyphs;
hb_set_t *_glyphset; hb_set_t *_glyphset;