Remove a few unnecessary hb_auto_t<>'s See a85641446c30247c4e948263f0f8c1147ed4efb9
diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc index 8b4f7e6..184db49 100644 --- a/src/hb-coretext.cc +++ b/src/hb-coretext.cc
@@ -474,8 +474,8 @@ buffer->merge_clusters (i - 1, i + 1); } - hb_auto_t<hb_vector_t<feature_record_t> > feature_records; - hb_auto_t<hb_vector_t<range_record_t> > range_records; + hb_vector_t<feature_record_t> feature_records; + hb_vector_t<range_record_t> range_records; /* * Set up features. @@ -484,7 +484,7 @@ if (num_features) { /* Sort features by start/end events. */ - hb_auto_t<hb_vector_t<feature_event_t> > feature_events; + hb_vector_t<feature_event_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 @@ } /* Scan events and save features for each range. */ - hb_auto_t<hb_vector_t<active_feature_t> > active_features; + hb_vector_t<active_feature_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 f0dbef6..86f9d2c 100644 --- a/src/hb-ot-cmap-table.hh +++ b/src/hb-ot-cmap-table.hh
@@ -859,10 +859,8 @@ + CmapSubtableFormat12::get_sub_table_size (this->format12_groups); } - // Format 4 - hb_auto_t<hb_vector_t<CmapSubtableFormat4::segment_plan> > format4_segments; - // Format 12 - hb_auto_t<hb_vector_t<CmapSubtableLongGroup> > format12_groups; + hb_vector_t<CmapSubtableFormat4::segment_plan> format4_segments; + hb_vector_t<CmapSubtableLongGroup> 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 2ce52a1..10f4ca2 100644 --- a/src/hb-ot-layout-gsub-table.hh +++ b/src/hb-ot-layout-gsub-table.hh
@@ -110,8 +110,8 @@ inline bool subset (hb_subset_context_t *c) const { TRACE_SUBSET (this); - hb_auto_t<hb_vector_t<GlyphID> > from; - hb_auto_t<hb_vector_t<GlyphID> > to; + hb_vector_t<GlyphID> from; + hb_vector_t<GlyphID> to; hb_codepoint_t delta = deltaGlyphID; for (hb_auto_t<Coverage::Iter> iter (this+coverage); iter.more (); iter.next ()) { @@ -216,8 +216,8 @@ inline bool subset (hb_subset_context_t *c) const { TRACE_SUBSET (this); - hb_auto_t<hb_vector_t<GlyphID> > from; - hb_auto_t<hb_vector_t<GlyphID> > to; + hb_vector_t<GlyphID> from; + hb_vector_t<GlyphID> to; for (hb_auto_t<Coverage::Iter> 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 a406626..09f6425 100644 --- a/src/hb-ot-layout-gsubgpos.hh +++ b/src/hb-ot-layout-gsubgpos.hh
@@ -93,7 +93,7 @@ hb_face_t *face; hb_set_t *glyphs; - hb_auto_t<hb_set_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 19f8004..ea59b83 100644 --- a/src/hb-ot-layout.cc +++ b/src/hb-ot-layout.cc
@@ -708,8 +708,8 @@ hb_set_t *feature_indexes; private: - hb_auto_t<hb_set_t> visited_script; - hb_auto_t<hb_set_t> visited_langsys; + hb_set_t visited_script; + hb_set_t visited_langsys; }; static void @@ -836,7 +836,7 @@ { const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag); - hb_auto_t<hb_set_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 @@ unsigned int lookup_index, hb_set_t *glyphs) { - hb_auto_t<hb_map_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 @@ const hb_set_t *lookups, hb_set_t *glyphs) { - hb_auto_t<hb_map_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 0570060..64c8ad7 100644 --- a/src/hb-subset-plan.cc +++ b/src/hb-subset-plan.cc
@@ -55,7 +55,7 @@ static void _gsub_closure (hb_face_t *face, hb_set_t *gids_to_retain) { - hb_auto_t<hb_set_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 294fd84..ed61c62 100644 --- a/src/hb-subset.cc +++ b/src/hb-subset.cc
@@ -68,7 +68,7 @@ hb_bool_t result = false; if (source_blob->data) { - hb_auto_t<hb_vector_t<char> > buf; + hb_vector_t<char> 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 b12a053..26b99ed 100644 --- a/src/hb-uniscribe.cc +++ b/src/hb-uniscribe.cc
@@ -642,12 +642,12 @@ /* * Set up features. */ - hb_auto_t<hb_vector_t<OPENTYPE_FEATURE_RECORD> > feature_records; - hb_auto_t<hb_vector_t<range_record_t> > range_records; + hb_vector_t<OPENTYPE_FEATURE_RECORD> feature_records; + hb_vector_t<range_record_t> range_records; if (num_features) { /* Sort features by start/end events. */ - hb_auto_t<hb_vector_t<feature_event_t> > feature_events; + hb_vector_t<feature_event_t> feature_events; for (unsigned int i = 0; i < num_features; i++) { active_feature_t feature; @@ -682,7 +682,7 @@ } /* Scan events and save features for each range. */ - hb_auto_t<hb_vector_t<active_feature_t> > active_features; + hb_vector_t<active_feature_t> active_features; unsigned int last_index = 0; for (unsigned int i = 0; i < feature_events.len; i++) { @@ -854,8 +854,8 @@ #undef MAX_ITEMS OPENTYPE_TAG language_tag = hb_uint32_swap (hb_ot_tag_from_language (buffer->props.language)); - hb_auto_t<hb_vector_t<TEXTRANGE_PROPERTIES*> > range_properties; - hb_auto_t<hb_vector_t<int> > range_char_counts; + hb_vector_t<TEXTRANGE_PROPERTIES*> range_properties; + hb_vector_t<int> range_char_counts; unsigned int glyphs_offset = 0; unsigned int glyphs_len;