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 "DALi Version 1.0.45" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
visual-model-impl.cpp
diff --git
a/dali-toolkit/internal/text/visual-model-impl.cpp
b/dali-toolkit/internal/text/visual-model-impl.cpp
index
922f309
..
beeb08b
100644
(file)
--- a/
dali-toolkit/internal/text/visual-model-impl.cpp
+++ b/
dali-toolkit/internal/text/visual-model-impl.cpp
@@
-36,9
+36,9
@@
VisualModelPtr VisualModel::New()
return VisualModelPtr( new VisualModel() );
}
return VisualModelPtr( new VisualModel() );
}
-void VisualModel::SetGlyphs( const GlyphInfo* glyphs,
- const CharacterIndex* characterIndices,
- const Length* charactersPerGlyph,
+void VisualModel::SetGlyphs( const GlyphInfo*
const
glyphs,
+ const CharacterIndex* c
onst c
haracterIndices,
+ const Length* c
onst c
haractersPerGlyph,
Length numberOfGlyphs )
{
if( 0u == numberOfGlyphs )
Length numberOfGlyphs )
{
if( 0u == numberOfGlyphs )
@@
-225,7
+225,7
@@
void VisualModel::GetGlyphsPerCharacterMap( Length* glyphsPerCharacter,
memcpy( glyphsPerCharacter, mGlyphsPerCharacter.Begin() + characterIndex, numberOfCharacters * sizeof( Length ) );
}
memcpy( glyphsPerCharacter, mGlyphsPerCharacter.Begin() + characterIndex, numberOfCharacters * sizeof( Length ) );
}
-void VisualModel::SetGlyphPositions( const Vector2* glyphPositions,
+void VisualModel::SetGlyphPositions( const Vector2*
const
glyphPositions,
Length numberOfGlyphs )
{
if( 0u == numberOfGlyphs )
Length numberOfGlyphs )
{
if( 0u == numberOfGlyphs )
@@
-493,10
+493,10
@@
VisualModel::VisualModel()
mGlyphsPerCharacter(),
mGlyphPositions(),
mLines(),
mGlyphsPerCharacter(),
mGlyphPositions(),
mLines(),
- mTextColor(),
- mShadowColor(),
- mUnderlineColor(),
- mShadowOffset(),
+ mTextColor(
Color::BLACK
),
+ mShadowColor(
Color::BLACK
),
+ mUnderlineColor(
Color::BLACK
),
+ mShadowOffset(
Vector2::ZERO
),
mUnderlineHeight( 0.0f ),
mNaturalSize(),
mActualSize(),
mUnderlineHeight( 0.0f ),
mNaturalSize(),
mActualSize(),