Merge "DALi Version 1.2.49" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / character-set-conversion.h

diff --git a/dali-toolkit/internal/text/character-set-conversion.h b/dali-toolkit/internal/text/character-set-conversion.h
index 19784fb..e2306fe 100644 (file)
--- a/dali-toolkit/internal/text/character-set-conversion.h
+++ b/dali-toolkit/internal/text/character-set-conversion.h
@@ -22,15 +22,24 @@
 #include <stdint.h>
 #include <string>
 
-// INTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
-
 namespace Dali
 {
 
 namespace Toolkit
 {
 
+namespace Text
+{
+
+/**
+ * @brief Retrieves the number of bytes of a utf8 character.
+ *
+ * @param[in] utf8LeadByte The lead byte of the utf8 character.
+ *
+ * @return The number of bytes of the character.
+ */
+uint8_t GetUtf8Length( uint8_t utf8LeadByte );
+
 /**
  * @brief Retrieves the number of characters of the text array encoded in UTF8
  *
@@ -56,6 +65,11 @@ uint32_t GetNumberOfUtf8Bytes( const uint32_t* const utf32, uint32_t numberOfCha
  *
  * The @p utf32 buffer needs to be big enough to store all the characters.
  *
+ * If the text contains a single 'CR' character or a pair 'CR'+'LF', they are replaced by a 'LF'.
+ *
+ * @note GetNumberOfUtf8Characters() does not convert 'CR' or 'CR'+'LF' to 'LF' so the return number
+ * of characters of that method may be higher than the number of characters returned by this one.
+ *
  * @param[in] utf8 The pointer to the UTF8 array.
  * @param[in] length The length of the UTF8 array.
  * @param[out] utf32 The pointer to the UTF32 array.
@@ -86,6 +100,8 @@ uint32_t Utf32ToUtf8( const uint32_t* const utf32, uint32_t numberOfCharacters,
  */
 void Utf32ToUtf8( const uint32_t* const utf32, uint32_t numberOfCharacters, std::string& utf8 );
 
+} // namespace Text
+
 } // namespace Toolkit
 
 } // namespace Dali