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
(Vector) Fix crash issues
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
multi-language-support.cpp
diff --git
a/dali-toolkit/internal/text/multi-language-support.cpp
b/dali-toolkit/internal/text/multi-language-support.cpp
index
8c28dd5
..
795e7ae
100644
(file)
--- a/
dali-toolkit/internal/text/multi-language-support.cpp
+++ b/
dali-toolkit/internal/text/multi-language-support.cpp
@@
-49,20
+49,32
@@
MultilanguageSupport MultilanguageSupport::Get()
}
void MultilanguageSupport::SetScripts( const Vector<Character>& text,
}
void MultilanguageSupport::SetScripts( const Vector<Character>& text,
- const Vector<LineBreakInfo>& lineBreakInfo,
+ CharacterIndex startIndex,
+ Length numberOfCharacters,
Vector<ScriptRun>& scripts )
{
GetImplementation( *this ).SetScripts( text,
Vector<ScriptRun>& scripts )
{
GetImplementation( *this ).SetScripts( text,
- lineBreakInfo,
+ startIndex,
+ numberOfCharacters,
scripts );
}
void MultilanguageSupport::ValidateFonts( const Vector<Character>& text,
const Vector<ScriptRun>& scripts,
scripts );
}
void MultilanguageSupport::ValidateFonts( const Vector<Character>& text,
const Vector<ScriptRun>& scripts,
+ const Vector<FontDescriptionRun>& fontDescriptions,
+ const TextAbstraction::FontDescription& defaultFontDescription,
+ TextAbstraction::PointSize26Dot6 defaultFontPointSize,
+ CharacterIndex startIndex,
+ Length numberOfCharacters,
Vector<FontRun>& fonts )
{
GetImplementation( *this ).ValidateFonts( text,
scripts,
Vector<FontRun>& fonts )
{
GetImplementation( *this ).ValidateFonts( text,
scripts,
+ fontDescriptions,
+ defaultFontDescription,
+ defaultFontPointSize,
+ startIndex,
+ numberOfCharacters,
fonts );
}
fonts );
}