From 3a4e5dd425a2a37ff4c37db953943386c0b6e5d8 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 29 Oct 2018 18:05:25 -0700 Subject: [PATCH] Remove a few unnecessary hb_auto_t<>'s See a85641446c30247c4e948263f0f8c1147ed4efb9 --- src/hb-coretext.cc | 8 ++++---- src/hb-ot-cmap-table.hh | 6 ++---- src/hb-ot-layout-gsub-table.hh | 8 ++++---- src/hb-ot-layout-gsubgpos.hh | 2 +- src/hb-ot-layout.cc | 10 +++++----- src/hb-subset-plan.cc | 2 +- src/hb-subset.cc | 2 +- src/hb-uniscribe.cc | 12 ++++++------ 8 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc index 8b4f7e6a3..184db4944 100644 --- a/src/hb-coretext.cc +++ b/src/hb-coretext.cc @@ -474,8 +474,8 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan, buffer->merge_clusters (i - 1, i + 1); } - hb_auto_t > feature_records; - hb_auto_t > range_records; + hb_vector_t feature_records; + hb_vector_t range_records; /* * Set up features. @@ -484,7 +484,7 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan, if (num_features) { /* Sort features by start/end events. */ - hb_auto_t > feature_events; + hb_vector_t feature_events; for (unsigned int i = 0; i < num_features; i++) { const hb_aat_feature_mapping_t * mapping = hb_aat_layout_find_feature_mapping (features[i].tag); @@ -523,7 +523,7 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan, } /* Scan events and save features for each range. */ - hb_auto_t > active_features; + hb_vector_t active_features; unsigned int last_index = 0; for (unsigned int i = 0; i < feature_events.len; i++) { diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh index f0dbef69c..86f9d2ca5 100644 --- a/src/hb-ot-cmap-table.hh +++ b/src/hb-ot-cmap-table.hh @@ -859,10 +859,8 @@ struct cmap + CmapSubtableFormat12::get_sub_table_size (this->format12_groups); } - // Format 4 - hb_auto_t > format4_segments; - // Format 12 - hb_auto_t > format12_groups; + hb_vector_t format4_segments; + hb_vector_t format12_groups; }; inline bool sanitize (hb_sanitize_context_t *c) const diff --git a/src/hb-ot-layout-gsub-table.hh b/src/hb-ot-layout-gsub-table.hh index 2ce52a1b4..10f4ca24a 100644 --- a/src/hb-ot-layout-gsub-table.hh +++ b/src/hb-ot-layout-gsub-table.hh @@ -110,8 +110,8 @@ struct SingleSubstFormat1 inline bool subset (hb_subset_context_t *c) const { TRACE_SUBSET (this); - hb_auto_t > from; - hb_auto_t > to; + hb_vector_t from; + hb_vector_t to; hb_codepoint_t delta = deltaGlyphID; for (hb_auto_t iter (this+coverage); iter.more (); iter.next ()) { @@ -216,8 +216,8 @@ struct SingleSubstFormat2 inline bool subset (hb_subset_context_t *c) const { TRACE_SUBSET (this); - hb_auto_t > from; - hb_auto_t > to; + hb_vector_t from; + hb_vector_t to; for (hb_auto_t iter (this+coverage); iter.more (); iter.next ()) { if (!c->plan->glyphset->has (iter.get_glyph ())) diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh index a4066265c..09f642589 100644 --- a/src/hb-ot-layout-gsubgpos.hh +++ b/src/hb-ot-layout-gsubgpos.hh @@ -93,7 +93,7 @@ struct hb_closure_context_t : hb_face_t *face; hb_set_t *glyphs; - hb_auto_t out[1]; + hb_set_t out[1]; recurse_func_t recurse_func; unsigned int nesting_level_left; unsigned int debug_depth; diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc index 19f800401..ea59b8354 100644 --- a/src/hb-ot-layout.cc +++ b/src/hb-ot-layout.cc @@ -708,8 +708,8 @@ struct hb_collect_features_context_t hb_set_t *feature_indexes; private: - hb_auto_t visited_script; - hb_auto_t visited_langsys; + hb_set_t visited_script; + hb_set_t visited_langsys; }; static void @@ -836,7 +836,7 @@ hb_ot_layout_collect_lookups (hb_face_t *face, { const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag); - hb_auto_t feature_indexes; + hb_set_t feature_indexes; hb_ot_layout_collect_features (face, table_tag, scripts, languages, features, &feature_indexes); for (hb_codepoint_t feature_index = HB_SET_VALUE_INVALID; @@ -974,7 +974,7 @@ hb_ot_layout_lookup_substitute_closure (hb_face_t *face, unsigned int lookup_index, hb_set_t *glyphs) { - hb_auto_t done_lookups; + hb_map_t done_lookups; OT::hb_closure_context_t c (face, glyphs, &done_lookups); const OT::SubstLookup& l = _get_gsub (face).get_lookup (lookup_index); @@ -995,7 +995,7 @@ hb_ot_layout_lookups_substitute_closure (hb_face_t *face, const hb_set_t *lookups, hb_set_t *glyphs) { - hb_auto_t done_lookups; + hb_map_t done_lookups; OT::hb_closure_context_t c (face, glyphs, &done_lookups); const OT::GSUB& gsub = _get_gsub (face); diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc index 057006039..64c8ad798 100644 --- a/src/hb-subset-plan.cc +++ b/src/hb-subset-plan.cc @@ -55,7 +55,7 @@ _add_gid_and_children (const OT::glyf::accelerator_t &glyf, static void _gsub_closure (hb_face_t *face, hb_set_t *gids_to_retain) { - hb_auto_t lookup_indices; + hb_set_t lookup_indices; hb_ot_layout_collect_lookups (face, HB_OT_TAG_GSUB, nullptr, diff --git a/src/hb-subset.cc b/src/hb-subset.cc index 294fd8460..ed61c628f 100644 --- a/src/hb-subset.cc +++ b/src/hb-subset.cc @@ -68,7 +68,7 @@ _subset2 (hb_subset_plan_t *plan) hb_bool_t result = false; if (source_blob->data) { - hb_auto_t > buf; + hb_vector_t buf; unsigned int buf_size = _plan_estimate_subset_table_size (plan, source_blob->length); DEBUG_MSG(SUBSET, nullptr, "OT::%c%c%c%c initial estimated table size: %u bytes.", HB_UNTAG(tag), buf_size); if (unlikely (!buf.alloc (buf_size))) diff --git a/src/hb-uniscribe.cc b/src/hb-uniscribe.cc index b12a0539d..26b99ed15 100644 --- a/src/hb-uniscribe.cc +++ b/src/hb-uniscribe.cc @@ -642,12 +642,12 @@ _hb_uniscribe_shape (hb_shape_plan_t *shape_plan, /* * Set up features. */ - hb_auto_t > feature_records; - hb_auto_t > range_records; + hb_vector_t feature_records; + hb_vector_t range_records; if (num_features) { /* Sort features by start/end events. */ - hb_auto_t > feature_events; + hb_vector_t feature_events; for (unsigned int i = 0; i < num_features; i++) { active_feature_t feature; @@ -682,7 +682,7 @@ _hb_uniscribe_shape (hb_shape_plan_t *shape_plan, } /* Scan events and save features for each range. */ - hb_auto_t > active_features; + hb_vector_t active_features; unsigned int last_index = 0; for (unsigned int i = 0; i < feature_events.len; i++) { @@ -854,8 +854,8 @@ retry: #undef MAX_ITEMS OPENTYPE_TAG language_tag = hb_uint32_swap (hb_ot_tag_from_language (buffer->props.language)); - hb_auto_t > range_properties; - hb_auto_t > range_char_counts; + hb_vector_t range_properties; + hb_vector_t range_char_counts; unsigned int glyphs_offset = 0; unsigned int glyphs_len;