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

Nano optimization to hb_utf16_t and hb_utf32_t ::next()

This commit is contained in:
Konstantin Ritt 2015-11-07 01:58:38 +04:00
parent a6d7668a95
commit 44ae9be7a2
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/hb-utf-private.hh
View File

@ -146,11 +146,11 @@ struct hb_utf16_t
return text; return text;
} }
if (likely (hb_in_range (c, 0xD800u, 0xDBFFu))) if (likely (c <= 0xDBFFu && text < end))
{ {
/* High-surrogate in c */ /* High-surrogate in c */
hb_codepoint_t l; hb_codepoint_t l = *text;
if (text < end && ((l = *text), likely (hb_in_range (l, 0xDC00u, 0xDFFFu)))) if (likely (hb_in_range (l, 0xDC00u, 0xDFFFu)))
{ {
/* Low-surrogate in l */ /* Low-surrogate in l */
*unicode = (c << 10) + l - ((0xD800u << 10) - 0x10000u + 0xDC00u); *unicode = (c << 10) + l - ((0xD800u << 10) - 0x10000u + 0xDC00u);
@ -211,14 +211,9 @@ struct hb_utf32_t
hb_codepoint_t *unicode, hb_codepoint_t *unicode,
hb_codepoint_t replacement) hb_codepoint_t replacement)
{ {
hb_codepoint_t c = *text++; hb_codepoint_t c = *unicode = *text++;
if (validate && unlikely (c > 0x10FFFFu || hb_in_range (c, 0xD800u, 0xDFFFu))) if (validate && unlikely (c >= 0xD800u && (c <= 0xDFFFu || c > 0x10FFFFu)))
goto error; *unicode = replacement;
*unicode = c;
return text;
error:
*unicode = replacement;
return text; return text;
} }