From: Richard Underhill <r.underhill@partner.samsung.com>
Date: Mon, 9 Mar 2015 10:56:42 +0000 (+0000)
Subject: Corrected UTF-8 to UTF-32 conversion
X-Git-Tag: new_text_0.1~9
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=cd8bb980aa1099a0bc094240da6cfa013c1c0ad9;hp=b72975a0ce87da47181d23541e78e83b30a7dbc9

Corrected UTF-8 to UTF-32 conversion

Change-Id: I2d6485b7cecb4e1dce451eab5f3c9a0026e93852
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
---

diff --git a/dali-toolkit/internal/text/character-set-conversion.cpp b/dali-toolkit/internal/text/character-set-conversion.cpp
index abda102..aa2721a 100644
--- a/dali-toolkit/internal/text/character-set-conversion.cpp
+++ b/dali-toolkit/internal/text/character-set-conversion.cpp
@@ -145,7 +145,7 @@ uint32_t Utf8ToUtf32( const uint8_t* const utf8, uint32_t length, uint32_t* utf3
       case U3:
       {
         uint32_t& code = *utf32++;
-        code = leadByte & 0x1fu;
+        code = leadByte & 0x0fu;
         begin++;
         code <<= 6u;
         code |= *begin++ & 0x3fu;
@@ -157,7 +157,7 @@ uint32_t Utf8ToUtf32( const uint8_t* const utf8, uint32_t length, uint32_t* utf3
       case U4:
       {
         uint32_t& code = *utf32++;
-        code = leadByte & 0x1fu;
+        code = leadByte & 0x07u;
         begin++;
         code <<= 6u;
         code |= *begin++ & 0x3fu;