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

try to remove deprecated variable from struct definition

This commit is contained in:
Qunxin Liu 2019-03-25 19:59:37 -07:00 committed by Michiharu Ariza
parent 9c5d694af2
commit b12a5daad7
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,23 +207,24 @@ 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_deprecated.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();
hb_vector_t<hb_codepoint_t> glyphs;
plan->_glyphset = _populate_gids_to_retain (face, plan->_glyphset = _populate_gids_to_retain (face,
input->unicodes, input->unicodes,
input->glyphs, input->glyphs,
!plan->drop_layout, !plan->drop_layout,
plan->unicodes, plan->unicodes,
plan->codepoint_to_glyph, plan->codepoint_to_glyph,
&plan->glyphs_deprecated); &glyphs);
_create_old_gid_to_new_gid_map (face, _create_old_gid_to_new_gid_map (face,
input->retain_gids, input->retain_gids,
plan->glyphs_deprecated, glyphs,
plan->glyph_map, plan->glyph_map,
plan->reverse_glyph_map, plan->reverse_glyph_map,
&plan->_num_output_glyphs); &plan->_num_output_glyphs);
@ -242,7 +243,7 @@ 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_deprecated.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);

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

@ -54,7 +54,7 @@ struct hb_subset_plan_t
hb_map_t *reverse_glyph_map; hb_map_t *reverse_glyph_map;
// Deprecated members: // Deprecated members:
hb_vector_t<hb_codepoint_t> glyphs_deprecated; //hb_vector_t<hb_codepoint_t> glyphs_deprecated;
// Plan is only good for a specific source/dest so keep them with it // Plan is only good for a specific source/dest so keep them with it
hb_face_t *source; hb_face_t *source;