diff --git a/src/hb-array.hh b/src/hb-array.hh index 955373662..cd0e6c45c 100644 --- a/src/hb-array.hh +++ b/src/hb-array.hh @@ -194,13 +194,6 @@ struct hb_array_t : hb_iter_with_fallback_t, Type&> hb_qsort (arrayZ, length, this->get_item_size (), Type::cmp); return hb_sorted_array_t (*this); } - void qsort (unsigned int start, unsigned int end) - { - end = hb_min (end, length); - assert (start <= end); - if (likely (start < end)) - hb_qsort (arrayZ + start, end - start, this->get_item_size (), Type::cmp); - } /* * Other methods. diff --git a/src/hb-open-type.hh b/src/hb-open-type.hh index e66f45182..ac79f9421 100644 --- a/src/hb-open-type.hh +++ b/src/hb-open-type.hh @@ -667,8 +667,8 @@ struct ArrayOf unsigned int to_store = (unsigned int) -1) const { return as_array ().lfind (x, i, not_found, to_store); } - void qsort (unsigned int start = 0, unsigned int end = (unsigned int) -1) - { as_array ().qsort (start, end); } + void qsort () + { as_array ().qsort (); } HB_NODISCARD bool serialize (hb_serialize_context_t *c, unsigned items_len) { diff --git a/src/hb-ot-map.cc b/src/hb-ot-map.cc index 39215b335..39cc9fed2 100644 --- a/src/hb-ot-map.cc +++ b/src/hb-ot-map.cc @@ -343,7 +343,7 @@ hb_ot_map_builder_t::compile (hb_ot_map_t &m, /* Sort lookups and merge duplicates */ if (last_num_lookups < m.lookups[table_index].length) { - m.lookups[table_index].qsort (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 (); unsigned int j = last_num_lookups; for (unsigned int i = j + 1; i < m.lookups[table_index].length; i++) diff --git a/src/hb-vector.hh b/src/hb-vector.hh index 31b430fe1..b636e1d22 100644 --- a/src/hb-vector.hh +++ b/src/hb-vector.hh @@ -425,10 +425,8 @@ struct hb_vector_t /* Sorting API. */ - void qsort (int (*cmp)(const void*, const void*)) + void qsort (int (*cmp)(const void*, const void*) = Type::cmp) { as_array ().qsort (cmp); } - void qsort (unsigned int start = 0, unsigned int end = (unsigned int) -1) - { as_array ().qsort (start, end); } /* Unsorted search API. */ template