diff --git a/src/hb-algs.hh b/src/hb-algs.hh index b28a587d4..be3ef08fa 100644 --- a/src/hb-algs.hh +++ b/src/hb-algs.hh @@ -1339,15 +1339,12 @@ static inline void sort_r_swap(char *__restrict a, char *__restrict b, /* swap a, b iff a>b */ /* a and b must not be equal! */ /* __restrict is same as restrict but better support on old machines */ -template +template static inline int sort_r_cmpswap(char *__restrict a, char *__restrict b, size_t w, - int (*compar)(const void *_a, - const void *_b, - Ts... _ds), - Ts... ds) + Compar compar) { - if(compar(a, b, ds...) > 0) { + if(compar(a, b) > 0) { sort_r_swap(a, b, w); return 1; } @@ -1372,23 +1369,17 @@ static inline void sort_r_swap_blocks(char *ptr, size_t na, size_t nb) /* Implement recursive quicksort ourselves */ /* Note: quicksort is not stable, equivalent values may be swapped */ -template +template static inline void sort_r_simple(void *base, size_t nel, size_t w, - int (*compar)(const void *_a, - const void *_b, - Ts... _ds), - Ts... ds) + Compar compar) { char *b = (char *)base, *end = b + nel*w; - /* for(size_t i=0; i b && sort_r_cmpswap(pj-w,pj,w,compar,ds...); pj -= w) {} + for(pj = pi; pj > b && sort_r_cmpswap(pj-w,pj,w,compar); pj -= w) {} } } else @@ -1399,68 +1390,36 @@ static inline void sort_r_simple(void *base, size_t nel, size_t w, char *pl, *ple, *pr, *pre, *pivot; char *last = b+w*(nel-1), *tmp; - /* - Use median of second, middle and second-last items as pivot. - First and last may have been swapped with pivot and therefore be extreme - */ char *l[3]; l[0] = b + w; l[1] = b+w*(nel/2); l[2] = last - w; - /* printf("pivots: %i, %i, %i\n", *(int*)l[0], *(int*)l[1], *(int*)l[2]); */ - - if(compar(l[0],l[1],ds...) > 0) { SORT_R_SWAP(l[0], l[1], tmp); } - if(compar(l[1],l[2],ds...) > 0) { + if(compar(l[0],l[1]) > 0) { SORT_R_SWAP(l[0], l[1], tmp); } + if(compar(l[1],l[2]) > 0) { SORT_R_SWAP(l[1], l[2], tmp); - if(compar(l[0],l[1],ds...) > 0) { SORT_R_SWAP(l[0], l[1], tmp); } + if(compar(l[0],l[1]) > 0) { SORT_R_SWAP(l[0], l[1], tmp); } } - /* swap mid value (l[1]), and last element to put pivot as last element */ if(l[1] != last) { sort_r_swap(l[1], last, w); } - /* - pl is the next item on the left to be compared to the pivot - pr is the last item on the right that was compared to the pivot - ple is the left position to put the next item that equals the pivot - ple is the last right position where we put an item that equals the pivot - v- end (beyond the array) - EEEEEELLLLLLLLuuuuuuuuGGGGGGGEEEEEEEE. - ^- b ^- ple ^- pl ^- pr ^- pre ^- last (where the pivot is) - Pivot comparison key: - E = equal, L = less than, u = unknown, G = greater than, E = equal - */ pivot = last; ple = pl = b; pre = pr = last; - /* - Strategy: - Loop into the list from the left and right at the same time to find: - - an item on the left that is greater than the pivot - - an item on the right that is less than the pivot - Once found, they are swapped and the loop continues. - Meanwhile items that are equal to the pivot are moved to the edges of the - array. - */ while(pl < pr) { - /* Move left hand items which are equal to the pivot to the far left. - break when we find an item that is greater than the pivot */ for(; pl < pr; pl += w) { - cmp = compar(pl, pivot, ds...); + cmp = compar(pl, pivot); if(cmp > 0) { break; } else if(cmp == 0) { if(ple < pl) { sort_r_swap(ple, pl, w); } ple += w; } } - /* break if last batch of left hand items were equal to pivot */ if(pl >= pr) { break; } - /* Move right hand items which are equal to the pivot to the far right. - break when we find an item that is less than the pivot */ for(; pl < pr; ) { - pr -= w; /* Move right pointer onto an unprocessed item */ - cmp = compar(pr, pivot, ds...); + pr -= w; + cmp = compar(pr, pivot); if(cmp == 0) { pre -= w; if(pr < pre) { sort_r_swap(pr, pre, w); } @@ -1473,25 +1432,24 @@ static inline void sort_r_simple(void *base, size_t nel, size_t w, } } - pl = pr; /* pr may have gone below pl */ + pl = pr; - /* - Now we need to go from: EEELLLGGGGEEEE - to: LLLEEEEEEEGGGG - Pivot comparison key: - E = equal, L = less than, u = unknown, G = greater than, E = equal - */ sort_r_swap_blocks(b, ple-b, pl-ple); sort_r_swap_blocks(pr, pre-pr, end-pre); - /*for(size_t i=0; i +static inline void +hb_qsort (void *base, size_t nel, size_t width, + Compar compar) +{ + sort_r_simple (base, nel, width, compar); +} + static inline void hb_qsort (void *base, size_t nel, size_t width, int (*compar)(const void *_a, const void *_b)) @@ -1508,11 +1466,10 @@ hb_qsort (void *base, size_t nel, size_t width, int (*compar)(const void *_a, const void *_b, void *_arg), void *arg) { -#ifdef HAVE_GNU_QSORT_R - qsort_r (base, nel, width, compar, arg); -#else - sort_r_simple (base, nel, width, compar, arg); -#endif + hb_qsort (base, nel, width, + [compar, arg] (const void *a, const void *b) { + return compar (a, b, arg); + }); } diff --git a/src/hb-array.hh b/src/hb-array.hh index 00b70d867..8c7111874 100644 --- a/src/hb-array.hh +++ b/src/hb-array.hh @@ -221,16 +221,15 @@ struct hb_array_t : hb_iter_with_fallback_t, Type&> hb_sorted_array_t qsort (int (*cmp_)(const void*, const void*)) { - //static_assert (hb_enable_if (hb_is_trivially_copy_assignable(Type)), ""); if (likely (length)) hb_qsort (arrayZ, length, this->get_item_size (), cmp_); return hb_sorted_array_t (*this); } - hb_sorted_array_t qsort (int (*cmp_)(const void*, const void*, void *), void *arg) + template + hb_sorted_array_t qsort (Compar compar) { - //static_assert (hb_enable_if (hb_is_trivially_copy_assignable(Type)), ""); if (likely (length)) - hb_qsort (arrayZ, length, this->get_item_size (), cmp_, arg); + hb_qsort (arrayZ, length, this->get_item_size (), compar); return hb_sorted_array_t (*this); } hb_sorted_array_t qsort () diff --git a/src/hb-gpu-draw.cc b/src/hb-gpu-draw.cc index 1e0808092..94b363626 100644 --- a/src/hb-gpu-draw.cc +++ b/src/hb-gpu-draw.cc @@ -412,39 +412,24 @@ hb_gpu_draw_encode (hb_gpu_draw_t *draw) } /* Sort: descending by max, ascending by min */ - auto cmp_max_x_desc = [] (const void *a, const void *b, void *arg) -> int { - auto *infos = (const encode_curve_info_t *) arg; - double va = infos[*(const unsigned *)a].max_x; - double vb = infos[*(const unsigned *)b].max_x; - return (va > vb) ? -1 : (va < vb) ? 1 : 0; - }; - auto cmp_min_x_asc = [] (const void *a, const void *b, void *arg) -> int { - auto *infos = (const encode_curve_info_t *) arg; - double va = infos[*(const unsigned *)a].min_x; - double vb = infos[*(const unsigned *)b].min_x; - return (va < vb) ? -1 : (va > vb) ? 1 : 0; - }; - auto cmp_max_y_desc = [] (const void *a, const void *b, void *arg) -> int { - auto *infos = (const encode_curve_info_t *) arg; - double va = infos[*(const unsigned *)a].max_y; - double vb = infos[*(const unsigned *)b].max_y; - return (va > vb) ? -1 : (va < vb) ? 1 : 0; - }; - auto cmp_min_y_asc = [] (const void *a, const void *b, void *arg) -> int { - auto *infos = (const encode_curve_info_t *) arg; - double va = infos[*(const unsigned *)a].min_y; - double vb = infos[*(const unsigned *)b].min_y; - return (va < vb) ? -1 : (va > vb) ? 1 : 0; - }; + const encode_curve_info_t *infos = curve_infos.arrayZ; for (unsigned b = 0; b < num_hbands; b++) { unsigned off = hband_offsets[b]; unsigned count = hband_curve_counts[b]; hb_qsort (hband_curves.arrayZ + off, count, sizeof (unsigned), - cmp_max_x_desc, (void *) curve_infos.arrayZ); + [infos] (const void *a, const void *b) -> int { + double va = infos[*(const unsigned *)a].max_x; + double vb = infos[*(const unsigned *)b].max_x; + return (va > vb) ? -1 : (va < vb) ? 1 : 0; + }); hb_qsort (hband_curves_asc.arrayZ + off, count, sizeof (unsigned), - cmp_min_x_asc, (void *) curve_infos.arrayZ); + [infos] (const void *a, const void *b) -> int { + double va = infos[*(const unsigned *)a].min_x; + double vb = infos[*(const unsigned *)b].min_x; + return (va < vb) ? -1 : (va > vb) ? 1 : 0; + }); } for (unsigned b = 0; b < num_vbands; b++) @@ -452,9 +437,17 @@ hb_gpu_draw_encode (hb_gpu_draw_t *draw) unsigned off = vband_offsets[b]; unsigned count = vband_curve_counts[b]; hb_qsort (vband_curves.arrayZ + off, count, sizeof (unsigned), - cmp_max_y_desc, (void *) curve_infos.arrayZ); + [infos] (const void *a, const void *b) -> int { + double va = infos[*(const unsigned *)a].max_y; + double vb = infos[*(const unsigned *)b].max_y; + return (va > vb) ? -1 : (va < vb) ? 1 : 0; + }); hb_qsort (vband_curves_asc.arrayZ + off, count, sizeof (unsigned), - cmp_min_y_asc, (void *) curve_infos.arrayZ); + [infos] (const void *a, const void *b) -> int { + double va = infos[*(const unsigned *)a].min_y; + double vb = infos[*(const unsigned *)b].min_y; + return (va < vb) ? -1 : (va > vb) ? 1 : 0; + }); } /* Compute sizes */ diff --git a/src/hb-vector.hh b/src/hb-vector.hh index 015eade08..0a028b8df 100644 --- a/src/hb-vector.hh +++ b/src/hb-vector.hh @@ -705,10 +705,13 @@ struct hb_vector_t /* Sorting API. */ - void qsort (int (*cmp)(const void*, const void*) = Type::cmp) + void qsort (int (*cmp)(const void*, const void*)) { as_array ().qsort (cmp); } - void qsort (int (*cmp)(const void*, const void*, void *), void *arg) - { as_array ().qsort (cmp, arg); } + template + void qsort (Compar compar) + { as_array ().qsort (compar); } + void qsort () + { as_array ().qsort (Type::cmp); } /* Unsorted search API. */ template