commit 4445e5e2ecc257a5d0fa2f2715bb7181a47346da
author Behdad Esfahbod <behdad@behdad.org> Tue Sep 25 12:26:12 2012 -0400
committer Behdad Esfahbod <behdad@behdad.org> Tue Sep 25 12:26:12 2012 -0400
tree db616e10c101523c374b2547c3e9e13a80889e56
parent 1f66c3c1a0eb869c0d85a015235313177e0cec62

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

src/hb-utf-private.hh

diff --git a/src/hb-utf-private.hh b/src/hb-utf-private.hh
index 2224a03..f89aa23 100644
--- a/src/hb-utf-private.hh
+++ b/src/hb-utf-private.hh
@@ -86,14 +86,16 @@
 	     const uint16_t *end,
 	     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 */
-    uint16_t l;
-    if (text < end && ((l = *text), likely (l >= 0xdc00 && l < 0xe000))) {
+    hb_codepoint_t l;
+    if (text < end && ((l = *text), likely (hb_in_range<hb_codepoint_t> (l, 0xdc00, 0xdfff))))
+    {
       /* low surrogate */
-      *unicode = ((hb_codepoint_t) ((c) - 0xd800) * 0x400 + (l) - 0xdc00 + 0x10000);
+      *unicode = (c << 10) + l - ((0xd800 << 10) - 0x10000 + 0xdc00);
        text++;
     } else
       *unicode = -1;