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
Merge "UTC added for Text, Multi-language." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
shaper.h
diff --git
a/dali-toolkit/internal/text/shaper.h
b/dali-toolkit/internal/text/shaper.h
index
441465c
..
d423cc5
100644
(file)
--- a/
dali-toolkit/internal/text/shaper.h
+++ b/
dali-toolkit/internal/text/shaper.h
@@
-18,8
+18,10
@@
*
*/
*
*/
-//
IN
TERNAL INCLUDES
+//
EX
TERNAL INCLUDES
#include <dali/public-api/common/dali-vector.h>
#include <dali/public-api/common/dali-vector.h>
+
+// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/font-run.h>
#include <dali-toolkit/internal/text/script-run.h>
#include <dali-toolkit/internal/text/font-run.h>
#include <dali-toolkit/internal/text/script-run.h>
@@
-43,7
+45,7
@@
class VisualModel;
* @param[in] scripts Vector containing the script runs for the whole text.
* @param[in] fonts Vector with validated fonts.
* @param[out] glyphs Vector of glyphs in the visual order.
* @param[in] scripts Vector containing the script runs for the whole text.
* @param[in] fonts Vector with validated fonts.
* @param[out] glyphs Vector of glyphs in the visual order.
- * @param[out]
characterIndices
Vector containing the first character in the logical model that each glyph relates to.
+ * @param[out]
glyphToCharacterMap
Vector containing the first character in the logical model that each glyph relates to.
* @param[out] charactersPerGlyph Vector containing the number of characters per glyph.
*/
void ShapeText( const Vector<Character>& text,
* @param[out] charactersPerGlyph Vector containing the number of characters per glyph.
*/
void ShapeText( const Vector<Character>& text,
@@
-51,7
+53,7
@@
void ShapeText( const Vector<Character>& text,
const Vector<ScriptRun>& scripts,
const Vector<FontRun>& fonts,
Vector<GlyphInfo>& glyphs,
const Vector<ScriptRun>& scripts,
const Vector<FontRun>& fonts,
Vector<GlyphInfo>& glyphs,
- Vector<CharacterIndex>&
characterIndices
,
+ Vector<CharacterIndex>&
glyphToCharacterMap
,
Vector<Length>& charactersPerGlyph );
/**
Vector<Length>& charactersPerGlyph );
/**