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
[dali_1.4.10] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
markup-processor-helper-functions.h
diff --git
a/dali-toolkit/internal/text/markup-processor-helper-functions.h
b/dali-toolkit/internal/text/markup-processor-helper-functions.h
old mode 100644
(file)
new mode 100755
(executable)
index
45f586c
..
2b0cafb
--- a/
dali-toolkit/internal/text/markup-processor-helper-functions.h
+++ b/
dali-toolkit/internal/text/markup-processor-helper-functions.h
@@
-95,6
+95,15
@@
void JumpToWhiteSpace( const char*& stringBuffer,
const char* const stringEndBuffer );
/**
const char* const stringEndBuffer );
/**
+* @brief Converts a string into an unsigned int.
+*
+* @param[in] uintStr An unsigned int packed inside a string.
+*
+* @return The unsigned int value.
+*/
+unsigned int StringToUint( const char* const uintStr );
+
+/**
* @brief Converts a string into an hexadecimal unsigned int.
*
* @param[in] uintStr An hexadecimal unsigned int packed inside a string.
* @brief Converts a string into an hexadecimal unsigned int.
*
* @param[in] uintStr An hexadecimal unsigned int packed inside a string.
@@
-121,6
+130,14
@@
float StringToFloat( const char* const floatStr );
void FloatToString( float value, std::string& floatStr );
/**
void FloatToString( float value, std::string& floatStr );
/**
+ * @brief Converts an unsigned int into a string.
+ *
+ * @param[in] value The unsigned int value.
+ * @param[out] uIntStr The string.
+ */
+void UintToString( unsigned int value, std::string& uIntStr );
+
+/**
* @brief Converts an ARGB color packed in 4 byte unsigned int into a Vector4 color used in Dali.
*
* @param[in] color An ARGB color packed in an unsigned int.
* @brief Converts an ARGB color packed in 4 byte unsigned int into a Vector4 color used in Dali.
*
* @param[in] color An ARGB color packed in an unsigned int.