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
Changed JSON parser to write valid JSON
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
multi-language-support-impl.h
diff --git
a/dali-toolkit/internal/text/multi-language-support-impl.h
b/dali-toolkit/internal/text/multi-language-support-impl.h
index
4dfc85c
..
e6105ac
100644
(file)
--- a/
dali-toolkit/internal/text/multi-language-support-impl.h
+++ b/
dali-toolkit/internal/text/multi-language-support-impl.h
@@
-97,10
+97,12
@@
public:
Vector<ScriptRun>& scripts );
/**
Vector<ScriptRun>& scripts );
/**
- * @copydoc Dali::MultilanguageSupport::ValidateFonts(
const Vector<Character>& text, const Vector<ScriptRun>& scripts, Vector<FontRun>& fonts
)
+ * @copydoc Dali::MultilanguageSupport::ValidateFonts()
*/
void ValidateFonts( const Vector<Character>& text,
const Vector<ScriptRun>& scripts,
*/
void ValidateFonts( const Vector<Character>& text,
const Vector<ScriptRun>& scripts,
+ const Vector<FontDescriptionRun>& fontDescriptions,
+ FontId defaultFontId,
Vector<FontRun>& fonts );
private:
Vector<FontRun>& fonts );
private: