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

Remove a few unnecessary hb_auto_t<>'s

Browse Source 
See a85641446c30247c4e948263f0f8c1147ed4efb9
This commit is contained in:
Behdad Esfahbod 2018-10-29 18:05:25 -07:00
parent 67a22f377d
commit 3a4e5dd425
8 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hb-coretext.cc
View File

@ -474,8 +474,8 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan,
buffer->merge_clusters (i - 1, i + 1); buffer->merge_clusters (i - 1, i + 1);
} }
hb_auto_t<hb_vector_t<feature_record_t> > feature_records; hb_vector_t<feature_record_t> feature_records;
hb_auto_t<hb_vector_t<range_record_t> > range_records; hb_vector_t<range_record_t> range_records;
/* /*
* Set up features. * Set up features.
@ -484,7 +484,7 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan,
if (num_features) if (num_features)
{ {
/* Sort features by start/end events. */ /* 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++) 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); 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. */ /* 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; unsigned int last_index = 0;
for (unsigned int i = 0; i < feature_events.len; i++) for (unsigned int i = 0; i < feature_events.len; i++)
{ {

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

@ -859,10 +859,8 @@ struct cmap
+ CmapSubtableFormat12::get_sub_table_size (this->format12_groups); + CmapSubtableFormat12::get_sub_table_size (this->format12_groups);
} }
// Format 4 hb_vector_t<CmapSubtableFormat4::segment_plan> format4_segments;
hb_auto_t<hb_vector_t<CmapSubtableFormat4::segment_plan> > format4_segments; hb_vector_t<CmapSubtableLongGroup> format12_groups;
// Format 12
hb_auto_t<hb_vector_t<CmapSubtableLongGroup> > format12_groups;
}; };
inline bool sanitize (hb_sanitize_context_t *c) const inline bool sanitize (hb_sanitize_context_t *c) const

8
src/hb-ot-layout-gsub-table.hh
View File

@ -110,8 +110,8 @@ struct SingleSubstFormat1
inline bool subset (hb_subset_context_t *c) const inline bool subset (hb_subset_context_t *c) const
{ {
TRACE_SUBSET (this); TRACE_SUBSET (this);
hb_auto_t<hb_vector_t<GlyphID> > from; hb_vector_t<GlyphID> from;
hb_auto_t<hb_vector_t<GlyphID> > to; hb_vector_t<GlyphID> to;
hb_codepoint_t delta = deltaGlyphID; hb_codepoint_t delta = deltaGlyphID;
for (hb_auto_t<Coverage::Iter> iter (this+coverage); iter.more (); iter.next ()) for (hb_auto_t<Coverage::Iter> iter (this+coverage); iter.more (); iter.next ())
{ {
@ -216,8 +216,8 @@ struct SingleSubstFormat2
inline bool subset (hb_subset_context_t *c) const inline bool subset (hb_subset_context_t *c) const
{ {
TRACE_SUBSET (this); TRACE_SUBSET (this);
hb_auto_t<hb_vector_t<GlyphID> > from; hb_vector_t<GlyphID> from;
hb_auto_t<hb_vector_t<GlyphID> > to; hb_vector_t<GlyphID> to;
for (hb_auto_t<Coverage::Iter> iter (this+coverage); iter.more (); iter.next ()) for (hb_auto_t<Coverage::Iter> iter (this+coverage); iter.more (); iter.next ())
{ {
if (!c->plan->glyphset->has (iter.get_glyph ())) if (!c->plan->glyphset->has (iter.get_glyph ()))

2
src/hb-ot-layout-gsubgpos.hh
View File

@ -93,7 +93,7 @@ struct hb_closure_context_t :
hb_face_t *face; hb_face_t *face;
hb_set_t *glyphs; hb_set_t *glyphs;
hb_auto_t<hb_set_t> out[1]; hb_set_t out[1];
recurse_func_t recurse_func; recurse_func_t recurse_func;
unsigned int nesting_level_left; unsigned int nesting_level_left;
unsigned int debug_depth; unsigned int debug_depth;

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

@ -708,8 +708,8 @@ struct hb_collect_features_context_t
hb_set_t *feature_indexes; hb_set_t *feature_indexes;
private: private:
hb_auto_t<hb_set_t> visited_script; hb_set_t visited_script;
hb_auto_t<hb_set_t> visited_langsys; hb_set_t visited_langsys;
}; };
static void 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); 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); hb_ot_layout_collect_features (face, table_tag, scripts, languages, features, &feature_indexes);
for (hb_codepoint_t feature_index = HB_SET_VALUE_INVALID; 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, unsigned int lookup_index,
hb_set_t *glyphs) 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); OT::hb_closure_context_t c (face, glyphs, &done_lookups);
const OT::SubstLookup& l = _get_gsub (face).get_lookup (lookup_index); 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, const hb_set_t *lookups,
hb_set_t *glyphs) 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); OT::hb_closure_context_t c (face, glyphs, &done_lookups);
const OT::GSUB& gsub = _get_gsub (face); const OT::GSUB& gsub = _get_gsub (face);

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

@ -55,7 +55,7 @@ _add_gid_and_children (const OT::glyf::accelerator_t &glyf,
static void static void
_gsub_closure (hb_face_t *face, hb_set_t *gids_to_retain) _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_layout_collect_lookups (face,
HB_OT_TAG_GSUB, HB_OT_TAG_GSUB,
nullptr, nullptr,

2
src/hb-subset.cc
View File

@ -68,7 +68,7 @@ _subset2 (hb_subset_plan_t *plan)
hb_bool_t result = false; hb_bool_t result = false;
if (source_blob->data) 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); 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); 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))) if (unlikely (!buf.alloc (buf_size)))

12
src/hb-uniscribe.cc
View File

@ -642,12 +642,12 @@ _hb_uniscribe_shape (hb_shape_plan_t *shape_plan,
/* /*
* Set up features. * Set up features.
*/ */
hb_auto_t<hb_vector_t<OPENTYPE_FEATURE_RECORD> > feature_records; hb_vector_t<OPENTYPE_FEATURE_RECORD> feature_records;
hb_auto_t<hb_vector_t<range_record_t> > range_records; hb_vector_t<range_record_t> range_records;
if (num_features) if (num_features)
{ {
/* Sort features by start/end events. */ /* 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++) for (unsigned int i = 0; i < num_features; i++)
{ {
active_feature_t feature; 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. */ /* 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; unsigned int last_index = 0;
for (unsigned int i = 0; i < feature_events.len; i++) for (unsigned int i = 0; i < feature_events.len; i++)
{ {
@ -854,8 +854,8 @@ retry:
#undef MAX_ITEMS #undef MAX_ITEMS
OPENTYPE_TAG language_tag = hb_uint32_swap (hb_ot_tag_from_language (buffer->props.language)); 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_vector_t<TEXTRANGE_PROPERTIES*> range_properties;
hb_auto_t<hb_vector_t<int> > range_char_counts; hb_vector_t<int> range_char_counts;
unsigned int glyphs_offset = 0; unsigned int glyphs_offset = 0;
unsigned int glyphs_len; unsigned int glyphs_len;