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

[vector] Remove .sub_array ()

This commit is contained in:
Behdad Esfahbod 2022-11-16 21:22:43 -07:00
parent c7d57dcf26
commit f2b5db700f
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/OT/glyf/Glyph.hh
View File

@ -228,7 +228,7 @@ struct Glyph
/* Init phantom points */ /* Init phantom points */
if (unlikely (!points.resize (points.length + PHANTOM_COUNT))) return false; if (unlikely (!points.resize (points.length + PHANTOM_COUNT))) return false;
hb_array_t<contour_point_t> phantoms = points.sub_array (points.length - PHANTOM_COUNT, PHANTOM_COUNT); hb_array_t<contour_point_t> phantoms = points.as_array ().sub_array (points.length - PHANTOM_COUNT, PHANTOM_COUNT);
{ {
int lsb = 0; int lsb = 0;
int h_delta = glyf_accelerator.hmtx->get_leading_bearing_without_var_unscaled (gid, &lsb) ? int h_delta = glyf_accelerator.hmtx->get_leading_bearing_without_var_unscaled (gid, &lsb) ?
@ -321,7 +321,7 @@ struct Glyph
if (all_points.length > HB_GLYF_MAX_POINTS) if (all_points.length > HB_GLYF_MAX_POINTS)
return false; return false;
all_points.extend (comp_points.sub_array (0, comp_points.length - PHANTOM_COUNT)); all_points.extend (comp_points.as_array ().sub_array (0, comp_points.length - PHANTOM_COUNT));
comp_index++; comp_index++;
} }

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

@ -343,7 +343,7 @@ hb_ot_map_builder_t::compile (hb_ot_map_t &m,
/* Sort lookups and merge duplicates */ /* Sort lookups and merge duplicates */
if (last_num_lookups < m.lookups[table_index].length) if (last_num_lookups < m.lookups[table_index].length)
{ {
m.lookups[table_index].sub_array (last_num_lookups, m.lookups[table_index].length - last_num_lookups).qsort (); m.lookups[table_index].as_array ().sub_array (last_num_lookups, m.lookups[table_index].length - last_num_lookups).qsort ();
unsigned int j = last_num_lookups; unsigned int j = last_num_lookups;
for (unsigned int i = j + 1; i < m.lookups[table_index].length; i++) for (unsigned int i = j + 1; i < m.lookups[table_index].length; i++)

9
src/hb-vector.hh
View File

@ -164,15 +164,6 @@ struct hb_vector_t
operator iter_t () const { return iter (); } operator iter_t () const { return iter (); }
operator writer_t () { return writer (); } operator writer_t () { return writer (); }
c_array_t sub_array (unsigned int start_offset, unsigned int count) const
{ return as_array ().sub_array (start_offset, count); }
c_array_t sub_array (unsigned int start_offset, unsigned int *count = nullptr /* IN/OUT */) const
{ return as_array ().sub_array (start_offset, count); }
array_t sub_array (unsigned int start_offset, unsigned int count)
{ return as_array ().sub_array (start_offset, count); }
array_t sub_array (unsigned int start_offset, unsigned int *count = nullptr /* IN/OUT */)
{ return as_array ().sub_array (start_offset, count); }
hb_sorted_array_t<Type> as_sorted_array () hb_sorted_array_t<Type> as_sorted_array ()
{ return hb_sorted_array (arrayZ, length); } { return hb_sorted_array (arrayZ, length); }
hb_sorted_array_t<const Type> as_sorted_array () const hb_sorted_array_t<const Type> as_sorted_array () const