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

Simplify hb_utf_prev<16> to call hb_utf_next<16>

This commit is contained in:
Behdad Esfahbod 2014-07-11 15:10:05 -04:00
parent c09a607a84
commit 7323d385cc
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,7 +134,8 @@ hb_utf_prev (const uint16_t *text,
const uint16_t *start, const uint16_t *start,
hb_codepoint_t *unicode) hb_codepoint_t *unicode)
{ {
hb_codepoint_t c = *--text; const uint16_t *end = text--;
hb_codepoint_t c = *text;
if (likely (!hb_in_range (c, 0xD800u, 0xDFFFu))) if (likely (!hb_in_range (c, 0xD800u, 0xDFFFu)))
{ {
@ -142,22 +143,14 @@ hb_utf_prev (const uint16_t *text,
return text; return text;
} }
if (likely (hb_in_range (c, 0xDC00u, 0xDFFFu))) if (likely (start < text && hb_in_range (c, 0xDC00u, 0xDFFFu)))
{
/* Low-surrogate in c */
hb_codepoint_t h;
if (start < text && ((h = *(text - 1)), likely (hb_in_range (h, 0xD800u, 0xDBFFu))))
{
/* High-surrogate in h */
*unicode = (h << 10) + c - ((0xD800u << 10) - 0x10000u + 0xDC00u);
text--; text--;
return text;
}
}
/* Lonely / out-of-order surrogate. */ if (likely (hb_utf_next (text, end, unicode) == end))
*unicode = -1;
return text; return text;
*unicode = -1;
return end - 1;
} }