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

[bit-set] Add del_array/del_sorted_array()

This commit is contained in:
Behdad Esfahbod 2021-08-18 21:16:05 -06:00
parent 48ad9eef1e
commit 0efa614c04
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/hb-bit-set.hh
View File

@ -154,7 +154,7 @@ struct hb_bit_set_t
} }
template <typename T> template <typename T>
void add_array (const T *array, unsigned int count, unsigned int stride=sizeof(T)) void set_array (bool v, const T *array, unsigned int count, unsigned int stride=sizeof(T))
{ {
if (unlikely (!successful)) return; if (unlikely (!successful)) return;
if (!count) return; if (!count) return;
@ -163,12 +163,13 @@ struct hb_bit_set_t
while (count) while (count)
{ {
unsigned int m = get_major (g); unsigned int m = get_major (g);
page_t *page = page_for (g, true); if (unlikely (!page)) return; page_t *page = page_for (g, v); if (unlikely (v && !page)) return;
unsigned int start = major_start (m); unsigned int start = major_start (m);
unsigned int end = major_start (m + 1); unsigned int end = major_start (m + 1);
do do
{ {
page->add (g); if (v || page) /* The v check is to optimize out the page check if v is true. */
page->set (g, v);
array = &StructAtOffsetUnaligned<T> (array, stride); array = &StructAtOffsetUnaligned<T> (array, stride);
count--; count--;
@ -176,13 +177,23 @@ struct hb_bit_set_t
while (count && (g = *array, start <= g && g < end)); while (count && (g = *array, start <= g && g < end));
} }
} }
template <typename T>
void add_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
{ set_array (true, array, count, stride); }
template <typename T> template <typename T>
void add_array (const hb_array_t<const T>& arr) { add_array (&arr, arr.len ()); } void add_array (const hb_array_t<const T>& arr) { add_array (&arr, arr.len ()); }
template <typename T>
void del_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
{ set_array (false, array, count, stride); }
template <typename T>
void del_array (const hb_array_t<const T>& arr) { del_array (&arr, arr.len ()); }
/* Might return false if array looks unsorted. /* Might return false if array looks unsorted.
* Used for faster rejection of corrupt data. */ * Used for faster rejection of corrupt data. */
template <typename T> template <typename T>
bool add_sorted_array (const T *array, unsigned int count, unsigned int stride=sizeof(T)) bool set_sorted_array (bool v, const T *array, unsigned int count, unsigned int stride=sizeof(T))
{ {
if (unlikely (!successful)) return true; /* https://github.com/harfbuzz/harfbuzz/issues/657 */ if (unlikely (!successful)) return true; /* https://github.com/harfbuzz/harfbuzz/issues/657 */
if (!count) return true; if (!count) return true;
@ -192,7 +203,7 @@ struct hb_bit_set_t
while (count) while (count)
{ {
unsigned int m = get_major (g); unsigned int m = get_major (g);
page_t *page = page_for (g, true); if (unlikely (!page)) return false; page_t *page = page_for (g, v); if (unlikely (v && !page)) return false;
unsigned int end = major_start (m + 1); unsigned int end = major_start (m + 1);
do do
{ {
@ -200,6 +211,8 @@ struct hb_bit_set_t
* Not sure if it's worth it. */ * Not sure if it's worth it. */
if (g < last_g) return false; if (g < last_g) return false;
last_g = g; last_g = g;
if (v || page) /* The v check is to optimize out the page check if v is true. */
page->add (g); page->add (g);
array = (const T *) ((const char *) array + stride); array = (const T *) ((const char *) array + stride);
@ -209,9 +222,19 @@ struct hb_bit_set_t
} }
return true; return true;
} }
template <typename T>
bool add_sorted_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
{ return set_sorted_array (true, array, count, stride); }
template <typename T> template <typename T>
bool add_sorted_array (const hb_sorted_array_t<const T>& arr) { return add_sorted_array (&arr, arr.len ()); } bool add_sorted_array (const hb_sorted_array_t<const T>& arr) { return add_sorted_array (&arr, arr.len ()); }
template <typename T>
bool del_sorted_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
{ return set_sorted_array (false, array, count, stride); }
template <typename T>
bool del_sorted_array (const hb_sorted_array_t<const T>& arr) { return del_sorted_array (&arr, arr.len ()); }
void del (hb_codepoint_t g) void del (hb_codepoint_t g)
{ {
/* TODO perform op even if !successful. */ /* TODO perform op even if !successful. */