Remove hb_auto_array_t Part of https://github.com/harfbuzz/harfbuzz/issues/1017
diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc index bb9b5ca..837b3fb 100644 --- a/src/hb-coretext.cc +++ b/src/hb-coretext.cc
@@ -641,8 +641,8 @@ buffer->merge_clusters (i - 1, i + 1); } - hb_auto_array_t<feature_record_t> feature_records; - hb_auto_array_t<range_record_t> range_records; + hb_auto_t<hb_vector_t<feature_record_t> > feature_records; + hb_auto_t<hb_vector_t<range_record_t> > range_records; /* * Set up features. @@ -651,7 +651,7 @@ if (num_features) { /* Sort features by start/end events. */ - hb_auto_array_t<feature_event_t> feature_events; + hb_auto_t<hb_vector_t<feature_event_t> > feature_events; for (unsigned int i = 0; i < num_features; i++) { const feature_mapping_t * mapping = (const feature_mapping_t *) bsearch (&features[i].tag, @@ -700,7 +700,7 @@ } /* Scan events and save features for each range. */ - hb_auto_array_t<active_feature_t> active_features; + hb_auto_t<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 0c313a7..9155b7c 100644 --- a/src/hb-ot-cmap-table.hh +++ b/src/hb-ot-cmap-table.hh
@@ -623,7 +623,7 @@ inline bool subset (hb_subset_plan_t *plan) const { - hb_auto_array_t<CmapSubtableLongGroup> groups; + hb_auto_t<hb_vector_t<CmapSubtableLongGroup> > groups; if (unlikely (!populate_groups (plan, &groups))) return false;
diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc index 9e6f858..42d29aa 100644 --- a/src/hb-ot-layout.cc +++ b/src/hb-ot-layout.cc
@@ -1109,7 +1109,7 @@ hb_apply_func_t apply_func; }; - typedef hb_auto_array_t<hb_applicable_t> array_t; + typedef hb_auto_t<hb_vector_t<hb_applicable_t> > array_t; /* Dispatch interface. */ inline const char *get_name (void) { return "GET_SUBTABLES"; }
diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc index c28e608..0c11765 100644 --- a/src/hb-subset-plan.cc +++ b/src/hb-subset-plan.cc
@@ -130,7 +130,7 @@ cmap.init (face); glyf.init (face); - hb_auto_array_t<unsigned int> bad_indices; + hb_auto_t<hb_vector_t<unsigned int> > bad_indices; old_gids.alloc (codepoints.len); for (unsigned int i = 0; i < codepoints.len; i++)
diff --git a/src/hb-uniscribe.cc b/src/hb-uniscribe.cc index b4717a3..bc6667c 100644 --- a/src/hb-uniscribe.cc +++ b/src/hb-uniscribe.cc
@@ -630,12 +630,12 @@ /* * Set up features. */ - hb_auto_array_t<OPENTYPE_FEATURE_RECORD> feature_records; - hb_auto_array_t<range_record_t> range_records; + hb_auto_t<hb_vector_t<OPENTYPE_FEATURE_RECORD> > feature_records; + hb_auto_t<hb_vector_t<range_record_t> > range_records; if (num_features) { /* Sort features by start/end events. */ - hb_auto_array_t<feature_event_t> feature_events; + hb_auto_t<hb_vector_t<feature_event_t> > feature_events; for (unsigned int i = 0; i < num_features; i++) { active_feature_t feature; @@ -676,7 +676,7 @@ } /* Scan events and save features for each range. */ - hb_auto_array_t<active_feature_t> active_features; + hb_auto_t<hb_vector_t<active_feature_t> > active_features; unsigned int last_index = 0; for (unsigned int i = 0; i < feature_events.len; i++) { @@ -858,8 +858,8 @@ #undef MAX_ITEMS OPENTYPE_TAG language_tag = hb_uint32_swap (hb_ot_tag_from_language (buffer->props.language)); - hb_auto_array_t<TEXTRANGE_PROPERTIES*> range_properties; - hb_auto_array_t<int> range_char_counts; + hb_auto_t<hb_vector_t<TEXTRANGE_PROPERTIES*> > range_properties; + hb_auto_t<hb_vector_t<int> > range_char_counts; unsigned int glyphs_offset = 0; unsigned int glyphs_len;