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
Add last clear color API in test gl abstraction.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
markup-processor-helper-functions.cpp
diff --git
a/dali-toolkit/internal/text/markup-processor-helper-functions.cpp
b/dali-toolkit/internal/text/markup-processor-helper-functions.cpp
old mode 100644
(file)
new mode 100755
(executable)
index
8af6140
..
6c133ae
--- a/
dali-toolkit/internal/text/markup-processor-helper-functions.cpp
+++ b/
dali-toolkit/internal/text/markup-processor-helper-functions.cpp
@@
-92,6
+92,11
@@
void JumpToWhiteSpace( const char*& stringBuffer,
for( ; ( WHITE_SPACE != *stringBuffer ) && ( stringBuffer < stringEndBuffer ); ++stringBuffer );
}
for( ; ( WHITE_SPACE != *stringBuffer ) && ( stringBuffer < stringEndBuffer ); ++stringBuffer );
}
+unsigned int StringToUint( const char* const uintStr )
+{
+ return static_cast<unsigned int>( strtoul( uintStr, NULL, 10 ) );
+}
+
unsigned int StringToHex( const char* const uintStr )
{
return static_cast<unsigned int>( strtoul( uintStr, NULL, 16 ) );
unsigned int StringToHex( const char* const uintStr )
{
return static_cast<unsigned int>( strtoul( uintStr, NULL, 16 ) );
@@
-109,6
+114,13
@@
void FloatToString( float value, std::string& floatStr )
floatStr = ss.str();
}
floatStr = ss.str();
}
+void UintToString( unsigned int value, std::string& uIntStr )
+{
+ std::stringstream ss;
+ ss << value;
+ uIntStr = ss.str();
+}
+
void UintColorToVector4( unsigned int color, Vector4& retColor )
{
retColor.a = static_cast<float>( ( color & 0xFF000000 ) >> 24u ) / 255.f;
void UintColorToVector4( unsigned int color, Vector4& retColor )
{
retColor.a = static_cast<float>( ( color & 0xFF000000 ) >> 24u ) / 255.f;