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

[buffer] Cleanup / optimize UTF-16 parsing a bit

This commit is contained in:
Behdad Esfahbod 2012-09-25 12:26:12 -04:00
parent 1f66c3c1a0
commit 4445e5e2ec
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,14 +86,16 @@ hb_utf_next (const uint16_t *text,
const uint16_t *end, const uint16_t *end,
hb_codepoint_t *unicode) hb_codepoint_t *unicode)
{ {
uint16_t c = *text++; hb_codepoint_t c = *text++;
if (unlikely (c >= 0xd800 && c < 0xdc00)) { if (unlikely (hb_in_range<hb_codepoint_t> (c, 0xd800, 0xdbff)))
{
/* high surrogate */ /* high surrogate */
uint16_t l; hb_codepoint_t l;
if (text < end && ((l = *text), likely (l >= 0xdc00 && l < 0xe000))) { if (text < end && ((l = *text), likely (hb_in_range<hb_codepoint_t> (l, 0xdc00, 0xdfff))))
{
/* low surrogate */ /* low surrogate */
*unicode = ((hb_codepoint_t) ((c) - 0xd800) * 0x400 + (l) - 0xdc00 + 0x10000); *unicode = (c << 10) + l - ((0xd800 << 10) - 0x10000 + 0xdc00);
text++; text++;
} else } else
*unicode = -1; *unicode = -1;