diff options
| author | Qunxin Liu <qxliu@google.com> | 2019-03-25 19:59:37 -0700 |
|---|---|---|
| committer | Garret Rieger <grieger@google.com> | 2019-03-26 13:39:33 -0700 |
| commit | 79a6c258497e80be15245a7b576e34443d9f7bff (patch) | |
| tree | 753aa53ce65f2fa6c1384c143853534cd318b6e3 | |
| parent | bcb4e505d6ffe33e3268a06698e75d6be0e64957 (diff) | |
try to remove deprecated variable from struct definition
| -rw-r--r-- | src/hb-subset-plan.cc | 9 | ||||
| -rw-r--r-- | src/hb-subset-plan.hh | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc index 49ab9e13..a001ebc1 100644 --- a/src/hb-subset-plan.cc +++ b/src/hb-subset-plan.cc @@ -207,23 +207,24 @@ hb_subset_plan_create (hb_face_t *face, plan->drop_layout = input->drop_layout; plan->desubroutinize = input->desubroutinize; plan->unicodes = hb_set_create(); - plan->glyphs_deprecated.init(); + //plan->glyphs_deprecated.init(); plan->source = hb_face_reference (face); plan->dest = hb_face_builder_create (); plan->codepoint_to_glyph = hb_map_create(); plan->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, input->unicodes, input->glyphs, !plan->drop_layout, plan->unicodes, plan->codepoint_to_glyph, - &plan->glyphs_deprecated); + &glyphs); _create_old_gid_to_new_gid_map (face, input->retain_gids, - plan->glyphs_deprecated, + glyphs, plan->glyph_map, plan->reverse_glyph_map, &plan->_num_output_glyphs); @@ -242,7 +243,7 @@ hb_subset_plan_destroy (hb_subset_plan_t *plan) if (!hb_object_destroy (plan)) return; hb_set_destroy (plan->unicodes); - plan->glyphs_deprecated.fini (); + //plan->glyphs_deprecated.fini (); hb_face_destroy (plan->source); hb_face_destroy (plan->dest); hb_map_destroy (plan->codepoint_to_glyph); diff --git a/src/hb-subset-plan.hh b/src/hb-subset-plan.hh index 32c19999..650a40b0 100644 --- a/src/hb-subset-plan.hh +++ b/src/hb-subset-plan.hh @@ -54,7 +54,7 @@ struct hb_subset_plan_t hb_map_t *reverse_glyph_map; // 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 hb_face_t *source; |