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

Add bfind() to prealloaced_array_t

This commit is contained in:
Behdad Esfahbod 2017-10-15 16:15:06 +02:00
parent db5f7ef189
commit 5e74044b6b
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/hb-private.hh
View File

@ -490,22 +490,17 @@ struct hb_prealloced_array_t
template <typename T> template <typename T>
inline Type *bsearch (T *x) inline Type *bsearch (T *x)
{ {
int min = 0, max = (int) this->len - 1; unsigned int i;
while (min <= max) return bfind (x, &i) ? &array[i] : nullptr;
{
int mid = (min + max) / 2;
int c = this->array[mid].cmp (x);
if (c < 0)
max = mid - 1;
else if (c > 0)
min = mid + 1;
else
return &this->array[mid];
}
return nullptr;
} }
template <typename T> template <typename T>
inline const Type *bsearch (T *x) const inline const Type *bsearch (T *x) const
{
unsigned int i;
return bfind (x, &i) ? &array[i] : nullptr;
}
template <typename T>
inline bool bfind (T *x, unsigned int *i) const
{ {
int min = 0, max = (int) this->len - 1; int min = 0, max = (int) this->len - 1;
while (min <= max) while (min <= max)
@ -517,9 +512,15 @@ struct hb_prealloced_array_t
else if (c > 0) else if (c > 0)
min = mid + 1; min = mid + 1;
else else
return &this->array[mid]; {
*i = mid;
return true;
}
} }
return nullptr; if (max < 0 || max < (int) this->len && this->array[max].cmp (x) < 0)
max++;
*i = max;
return false;
} }
inline void finish (void) inline void finish (void)