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

[array] Isolate bsearch implementation more

This commit is contained in:
Behdad Esfahbod 2019-12-06 03:00:23 +00:00
parent 06d3c2019f
commit fd6df520a1
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/hb-array.hh
View File

@ -297,9 +297,7 @@ struct hb_sorted_array_t :
return bfind (x, &i) ? &this->arrayZ[i] : not_found; return bfind (x, &i) ? &this->arrayZ[i] : not_found;
} }
template <typename T> template <typename T>
bool bfind (const T &x, unsigned int *i = nullptr, bool bsearch_impl (const T &x, unsigned int *pos) const
hb_bfind_not_found_t not_found = HB_BFIND_NOT_FOUND_DONT_STORE,
unsigned int to_store = (unsigned int) -1) const
{ {
int min = 0, max = (int) this->length - 1; int min = 0, max = (int) this->length - 1;
const Type *array = this->arrayZ; const Type *array = this->arrayZ;
@ -313,11 +311,27 @@ struct hb_sorted_array_t :
min = mid + 1; min = mid + 1;
else else
{ {
if (i) *pos = (unsigned) mid;
*i = mid;
return true; return true;
} }
} }
*pos = (unsigned) min;
return false;
}
template <typename T>
bool bfind (const T &x, unsigned int *i = nullptr,
hb_bfind_not_found_t not_found = HB_BFIND_NOT_FOUND_DONT_STORE,
unsigned int to_store = (unsigned int) -1) const
{
unsigned int pos = 0;
if (bsearch_impl (x, &pos))
{
if (i)
*i = pos;
return true;
}
if (i) if (i)
{ {
switch (not_found) switch (not_found)
@ -330,7 +344,7 @@ struct hb_sorted_array_t :
break; break;
case HB_BFIND_NOT_FOUND_STORE_CLOSEST: case HB_BFIND_NOT_FOUND_STORE_CLOSEST:
*i = min; *i = pos;
break; break;
} }
} }