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
Convert more shaders in dali-toolkit and dali-scene-loader to use shader compilation...
[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
d1ecbc8
..
d6f65c1
--- a/
dali-toolkit/internal/text/markup-processor-helper-functions.h
+++ b/
dali-toolkit/internal/text/markup-processor-helper-functions.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_HELPER_FUNCTIONS_H__
-#define
__DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_HELPER_FUNCTIONS_H__
+#ifndef
DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_HELPER_FUNCTIONS_H
+#define
DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_HELPER_FUNCTIONS_H
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-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.
@@
-183,4
+192,4
@@
void Vector2ToString( const Vector2& value, std::string& vector2Str );
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_HELPER_FUNCTIONS_H__
+#endif //
DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_HELPER_FUNCTIONS_H