From cd8bb980aa1099a0bc094240da6cfa013c1c0ad9 Mon Sep 17 00:00:00 2001 From: Richard Underhill Date: Mon, 9 Mar 2015 10:56:42 +0000 Subject: [PATCH] Corrected UTF-8 to UTF-32 conversion Change-Id: I2d6485b7cecb4e1dce451eab5f3c9a0026e93852 Signed-off-by: Richard Underhill --- dali-toolkit/internal/text/character-set-conversion.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; -- 2.7.4