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
Moved Text Controller & Markup Processor to sub-folders
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
multi-language-support-impl.cpp
diff --git
a/dali-toolkit/internal/text/multi-language-support-impl.cpp
b/dali-toolkit/internal/text/multi-language-support-impl.cpp
index
dbd110b
..
96210ca
100644
(file)
--- a/
dali-toolkit/internal/text/multi-language-support-impl.cpp
+++ b/
dali-toolkit/internal/text/multi-language-support-impl.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
2
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.
@@
-205,9
+205,9
@@
void MultilanguageSupport::SetScripts(const Vector<Character>& text,
currentScriptRun.isRightToLeft = false;
// Traverse all characters and set the scripts.
currentScriptRun.isRightToLeft = false;
// Traverse all characters and set the scripts.
- const Length lastCharacter = startIndex + numberOfCharacters;
+ const Length lastCharacter = startIndex + numberOfCharacters
- 1u
;
- for(Length index = startIndex; index < lastCharacter; ++index)
+ for(Length index = startIndex; index <
=
lastCharacter; ++index)
{
Character character = *(textBuffer + index);
{
Character character = *(textBuffer + index);
@@
-223,7
+223,7
@@
void MultilanguageSupport::SetScripts(const Vector<Character>& text,
// script of the first character of the paragraph with a defined script.
// Skip those characters valid for many scripts like white spaces or '\n'.
// script of the first character of the paragraph with a defined script.
// Skip those characters valid for many scripts like white spaces or '\n'.
- bool endOfText = index
==
lastCharacter;
+ bool endOfText = index
>
lastCharacter;
//Handle all Emoji Sequence cases
if(IsNewSequence(textBuffer, currentScriptRun.script, index, lastCharacter, script))
//Handle all Emoji Sequence cases
if(IsNewSequence(textBuffer, currentScriptRun.script, index, lastCharacter, script))
@@
-280,7
+280,7
@@
void MultilanguageSupport::SetScripts(const Vector<Character>& text,
// Get the next character.
++index;
// Get the next character.
++index;
- endOfText = index
==
lastCharacter;
+ endOfText = index
>
lastCharacter;
if(!endOfText)
{
character = *(textBuffer + index);
if(!endOfText)
{
character = *(textBuffer + index);
@@
-471,8
+471,8
@@
void MultilanguageSupport::ValidateFonts(const Vector<Character>&
FontId previousEmojiFontId = 0u;
TextAbstraction::Script previousScript = TextAbstraction::UNKNOWN;
FontId previousEmojiFontId = 0u;
TextAbstraction::Script previousScript = TextAbstraction::UNKNOWN;
- CharacterIndex lastCharacter = startIndex + numberOfCharacters;
- for(Length index = startIndex; index < lastCharacter; ++index)
+ CharacterIndex lastCharacter = startIndex + numberOfCharacters
- 1u
;
+ for(Length index = startIndex; index <
=
lastCharacter; ++index)
{
// Get the current character.
const Character character = *(textBuffer + index);
{
// Get the current character.
const Character character = *(textBuffer + index);
@@
-500,6
+500,7
@@
void MultilanguageSupport::ValidateFonts(const Vector<Character>&
scriptRunEndIt);
#ifdef DEBUG_ENABLED
scriptRunEndIt);
#ifdef DEBUG_ENABLED
+ if(gLogFilter->IsEnabledFor(Debug::Verbose))
{
Dali::TextAbstraction::FontDescription description;
fontClient.GetDescription(fontId, description);
{
Dali::TextAbstraction::FontDescription description;
fontClient.GetDescription(fontId, description);
@@
-716,6
+717,7
@@
void MultilanguageSupport::ValidateFonts(const Vector<Character>&
}
#ifdef DEBUG_ENABLED
}
#ifdef DEBUG_ENABLED
+ if(gLogFilter->IsEnabledFor(Debug::Verbose))
{
Dali::TextAbstraction::FontDescription description;
fontClient.GetDescription(fontId, description);
{
Dali::TextAbstraction::FontDescription description;
fontClient.GetDescription(fontId, description);