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

[face] Minor cleaning of previous commit

This commit is contained in:
Behdad Esfahbod 2021-08-05 11:51:54 -06:00
parent c2ee1fdd40
commit 74ad5ddcd7
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/hb-face.cc
View File

@ -627,18 +627,17 @@ struct hb_face_builder_data_t
hb_hashmap_t<hb_tag_t, hb_blob_t*, (unsigned)-1, nullptr> tables; hb_hashmap_t<hb_tag_t, hb_blob_t*, (unsigned)-1, nullptr> tables;
}; };
static int compare_entries (const void* a, const void* b) static int compare_entries (const void* pa, const void* pb)
{ {
hb_pair_t <hb_tag_t, hb_blob_t*>* pair_a = (hb_pair_t <hb_tag_t, hb_blob_t*>*) a; const auto& a = * (const hb_pair_t<hb_tag_t, hb_blob_t*> *) pa;
hb_pair_t <hb_tag_t, hb_blob_t*>* pair_b = (hb_pair_t <hb_tag_t, hb_blob_t*>*) b; const auto& b = * (const hb_pair_t<hb_tag_t, hb_blob_t*> *) pb;
// Order by blob size first (smallest to largest) and then table tag. /* Order by blob size first (smallest to largest) and then table tag */
if (hb_blob_get_length (pair_a->second) < hb_blob_get_length (pair_b->second)) return -1;
if (hb_blob_get_length (pair_a->second) > hb_blob_get_length (pair_b->second)) return 1;
if (pair_a->first < pair_b->first) return -1; if (a.second->length != b.second->length)
if (pair_a->first > pair_b->first) return 1; return a.second->length < b.second->length ? -1 : +1;
return 0;
return a.first < b.first ? -1 : a.first == b.first ? 0 : +1;
} }
static hb_face_builder_data_t * static hb_face_builder_data_t *