X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fvisual-model-impl.cpp;h=beeb08b21e55e12016c4274964b4b44252e6a111;hb=f348038a5e190e62e11c027ecfe45ee909619997;hp=a5fead41b76908694b64cdf17b7b6dce848cc33a;hpb=0a2f5e1551be90466c7b64173bd750c4009c744e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/visual-model-impl.cpp b/dali-toolkit/internal/text/visual-model-impl.cpp index a5fead4..beeb08b 100644 --- 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() ); } -void VisualModel::SetGlyphs( const GlyphInfo* glyphs, - const CharacterIndex* characterIndices, - const Length* charactersPerGlyph, +void VisualModel::SetGlyphs( const GlyphInfo* const glyphs, + const CharacterIndex* const characterIndices, + const Length* const charactersPerGlyph, Length numberOfGlyphs ) { if( 0u == numberOfGlyphs ) @@ -225,7 +225,7 @@ void VisualModel::GetGlyphsPerCharacterMap( Length* glyphsPerCharacter, 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 ) @@ -493,16 +493,16 @@ VisualModel::VisualModel() mGlyphsPerCharacter(), mGlyphPositions(), mLines(), - mTextColor(), - mShadowColor(), - mUnderlineColor(), - mShadowOffset(), + mTextColor( Color::BLACK ), + mShadowColor( Color::BLACK ), + mUnderlineColor( Color::BLACK ), + mShadowOffset( Vector2::ZERO ), mUnderlineHeight( 0.0f ), - mUnderlineEnabled( false ), - mUnderlineColorSet( false ), mNaturalSize(), mActualSize(), - mCachedLineIndex( 0u ) + mCachedLineIndex( 0u ), + mUnderlineEnabled( false ), + mUnderlineColorSet( false ) { }