[set] Don't use major()

Fixes https://github.com/behdad/harfbuzz/issues/577
This commit is contained in:
Behdad Esfahbod 2017-10-23 08:36:40 -04:00
parent d0f0ff85b9
commit dd33e4e96b
1 changed files with 5 additions and 5 deletions

View File

@ -361,7 +361,7 @@ struct hb_set_t
return *codepoint != INVALID;
}
page_map_t map = {major (*codepoint), 0};
page_map_t map = {get_major (*codepoint), 0};
unsigned int i;
page_map.bfind (&map, &i);
if (i < page_map.len)
@ -432,7 +432,7 @@ struct hb_set_t
page_t *page_for_insert (hb_codepoint_t g)
{
page_map_t map = {major (g), pages.len};
page_map_t map = {get_major (g), pages.len};
unsigned int i;
if (!page_map.bfind (&map, &i))
{
@ -447,7 +447,7 @@ struct hb_set_t
}
page_t *page_for (hb_codepoint_t g)
{
page_map_t key = {major (g)};
page_map_t key = {get_major (g)};
const page_map_t *found = page_map.bsearch (&key);
if (found)
return &pages[found->index];
@ -455,7 +455,7 @@ struct hb_set_t
}
const page_t *page_for (hb_codepoint_t g) const
{
page_map_t key = {major (g)};
page_map_t key = {get_major (g)};
const page_map_t *found = page_map.bsearch (&key);
if (found)
return &pages[found->index];
@ -463,7 +463,7 @@ struct hb_set_t
}
page_t &page_at (unsigned int i) { return pages[page_map[i].index]; }
const page_t &page_at (unsigned int i) const { return pages[page_map[i].index]; }
unsigned int major (hb_codepoint_t g) const { return g / page_t::PAGE_BITS; }
unsigned int get_major (hb_codepoint_t g) const { return g / page_t::PAGE_BITS; }
};