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

[set] Rewrite another way :P

This commit is contained in:
Behdad Esfahbod 2017-10-23 14:28:35 -04:00
parent 8170801d78
commit 30a591e3ce
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/hb-set-private.hh
View File

@ -274,11 +274,11 @@ struct hb_set_t
{ {
if (unlikely (in_error)) return; if (unlikely (in_error)) return;
int na = pages.len; unsigned int na = pages.len;
int nb = other->pages.len; unsigned int nb = other->pages.len;
unsigned int count = 0; unsigned int count = 0;
int a = 0, b = 0; unsigned int a = 0, b = 0;
for (; a < na && b < nb; ) for (; a < na && b < nb; )
{ {
if (page_map[a].major == other->page_map[b].major) if (page_map[a].major == other->page_map[b].major)
@ -309,34 +309,35 @@ struct hb_set_t
return; return;
/* Process in-place backward. */ /* Process in-place backward. */
a = na - 1, b = nb - 1; a = na;
for (; a >= 0 && b >= 0; ) b = nb;
for (; a && b; )
{ {
if (page_map[a].major == other->page_map[b].major) if (page_map[a].major == other->page_map[b].major)
{ {
Op::process (page_at (--count).v, page_at (a).v, other->page_at (b).v);
a--; a--;
b--; b--;
Op::process (page_at (--count).v, page_at (a).v, other->page_at (b).v);
} }
else if (page_map[a].major > other->page_map[b].major) else if (page_map[a].major > other->page_map[b].major)
{ {
a--;
if (Op::passthru_left) if (Op::passthru_left)
page_at (--count).v = page_at (a).v; page_at (--count).v = page_at (a).v;
a--;
} }
else else
{ {
b--;
if (Op::passthru_right) if (Op::passthru_right)
page_at (--count).v = other->page_at (b).v; page_at (--count).v = other->page_at (b).v;
b--;
} }
} }
if (Op::passthru_left) if (Op::passthru_left)
while (a >= 0) while (a)
page_at (--count).v = page_at (a--).v; page_at (--count).v = page_at (--a).v;
if (Op::passthru_right) if (Op::passthru_right)
while (b >= 0) while (b)
page_at (--count).v = other->page_at (b--).v; page_at (--count).v = other->page_at (--b).v;
assert (!count); assert (!count);
} }