projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Picked some defaults for dali-demo on Ubuntu
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
character-set-conversion.cpp
diff --git
a/dali-toolkit/internal/text/character-set-conversion.cpp
b/dali-toolkit/internal/text/character-set-conversion.cpp
index
abda102
..
3afecbb
100644
(file)
--- 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++;
case U3:
{
uint32_t& code = *utf32++;
- code = leadByte & 0x
1
fu;
+ code = leadByte & 0x
0
fu;
begin++;
code <<= 6u;
code |= *begin++ & 0x3fu;
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++;
case U4:
{
uint32_t& code = *utf32++;
- code = leadByte & 0x
1f
u;
+ code = leadByte & 0x
07
u;
begin++;
code <<= 6u;
code |= *begin++ & 0x3fu;
begin++;
code <<= 6u;
code |= *begin++ & 0x3fu;
@@
-173,11
+173,13
@@
uint32_t Utf8ToUtf32( const uint8_t* const utf8, uint32_t length, uint32_t* utf3
return numberOfCharacters;
}
return numberOfCharacters;
}
-
void
Utf32ToUtf8( const uint32_t* const utf32, uint32_t numberOfCharacters, uint8_t* utf8 )
+
uint32_t
Utf32ToUtf8( const uint32_t* const utf32, uint32_t numberOfCharacters, uint8_t* utf8 )
{
const uint32_t* begin = utf32;
const uint32_t* end = utf32 + numberOfCharacters;
{
const uint32_t* begin = utf32;
const uint32_t* end = utf32 + numberOfCharacters;
+ uint8_t* utf8Begin = utf8;
+
for( ; begin < end; ++begin )
{
const uint32_t code = *begin;
for( ; begin < end; ++begin )
{
const uint32_t code = *begin;
@@
-205,6
+207,8
@@
void Utf32ToUtf8( const uint32_t* const utf32, uint32_t numberOfCharacters, uint
*utf8++ = static_cast<uint8_t>( code & 0x3f ) | 0x80u; // continuation byte
}
}
*utf8++ = static_cast<uint8_t>( code & 0x3f ) | 0x80u; // continuation byte
}
}
+
+ return utf8 - utf8Begin;
}
} // namespace Toolkit
}
} // namespace Toolkit