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

Remove hb_auto_array_t 

Part of https://github.com/harfbuzz/harfbuzz/issues/1017
This commit is contained in:
Behdad Esfahbod 2018-05-01 19:09:00 -04:00
parent 5c3112aec8
commit 37b95612d4
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hb-coretext.cc
View File

@ -641,8 +641,8 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan,
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 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan,
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 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan,
}
/* 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++)
{

2
src/hb-ot-cmap-table.hh
View File

@ -623,7 +623,7 @@ struct cmap
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;

2
src/hb-ot-layout.cc
View File

@ -1109,7 +1109,7 @@ struct hb_get_subtables_context_t :
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"; }

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

@ -130,7 +130,7 @@ _populate_gids_to_retain (hb_face_t *face,
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++)

12
src/hb-uniscribe.cc
View File

@ -630,12 +630,12 @@ _hb_uniscribe_shape (hb_shape_plan_t *shape_plan,
/*
* 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 @@ _hb_uniscribe_shape (hb_shape_plan_t *shape_plan,
}
/* 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 @@ retry:
#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;