From 0682fab6a2ad52f51a440336e99a9abe28e7c050 Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 31 May 2008 10:14:38 +0000 Subject: * enc/utf_16{be,le}.c (utf16{be,le}_code_to_mbc): fix codepoint to bytes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enc/utf_16be.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'enc/utf_16be.c') diff --git a/enc/utf_16be.c b/enc/utf_16be.c index 2ef3199633..f80711d9bd 100644 --- a/enc/utf_16be.c +++ b/enc/utf_16be.c @@ -132,14 +132,12 @@ utf16be_code_to_mbc(OnigCodePoint code, UChar *buf, UChar* p = buf; if (code > 0xffff) { - unsigned int plane, high; - - plane = code >> 16; - *p++ = (plane >> 2) + 0xd8; - high = (code & 0xff00) >> 8; - *p++ = ((plane & 0x03) << 6) + (high >> 2); - *p++ = (high & 0x02) + 0xdc; - *p = (UChar )(code & 0xff); + unsigned int high = (code >> 10) + 0xD7C0; + unsigned int low = (code & 0x3FF) + 0xDC00; + *p++ = (high >> 8) & 0xFF; + *p++ = high & 0xFF; + *p++ = (low >> 8) & 0xFF; + *p++ = low & 0xFF; return 4; } else { -- cgit v1.2.3