From: Paul Wisbey
Date: Tue, 10 Mar 2015 14:13:45 +0000 (-0700)
Subject: Merge "TextModel - Clear the buffers if the number of items is zero." into new_text
X-Git-Tag: new_text_0.1~4
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=bc3f6676e011edfad5d5c40558e7250e9b50e015
Merge "TextModel - Clear the buffers if the number of items is zero." into new_text
---
bc3f6676e011edfad5d5c40558e7250e9b50e015
diff --cc dali-toolkit/internal/text/visual-model.cpp
index 4ee9015,6351ec3..9daa2d1
--- a/dali-toolkit/internal/text/visual-model.cpp
+++ b/dali-toolkit/internal/text/visual-model.cpp
@@@ -168,15 -188,17 +188,22 @@@ void VisualModel::SetGlyphPositions( co
Length numberOfGlyphs )
{
Vector& modelPositions = mImpl->mGlyphPositions;
- modelPositions.Resize( numberOfGlyphs );
- memcpy( modelPositions.Begin(), glyphPositions, numberOfGlyphs * sizeof( Vector2 ) );
+ if( 0u == numberOfGlyphs )
+ {
+ modelPositions.Clear();
+ }
+ else
+ {
+ modelPositions.Resize( numberOfGlyphs );
+ memcpy( modelPositions.Begin(), glyphPositions, numberOfGlyphs * sizeof( Vector2 ) );
+ }
}
+Length VisualModel::GetNumberOfGlyphPositions() const
+{
+ return mImpl->mGlyphPositions.Count();
+}
+
void VisualModel::GetGlyphPositions( Vector2* glyphPositions,
GlyphIndex glyphIndex,
Length numberOfGlyphs ) const