X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-view.cpp;h=d12c697c2e25d8b0d81892d687f4b7ac43c757bb;hp=235f534edf98212ee4738df7482d90ee51f940e7;hb=c6d0c84be1f07a71e866d8387acb5948eee67ec2;hpb=a314b4d8d02b983f50b5faafb225f0f3e4593a45;ds=sidebyside

diff --git a/dali-toolkit/internal/text/text-view.cpp b/dali-toolkit/internal/text/text-view.cpp
index 235f534..d12c697 100644
--- a/dali-toolkit/internal/text/text-view.cpp
+++ b/dali-toolkit/internal/text/text-view.cpp
@@ -55,7 +55,14 @@ Length View::GetNumberOfGlyphs() const
 {
   if( mImpl->mVisualModel )
   {
-    return mImpl->mVisualModel->GetNumberOfGlyphs();
+    VisualModel& model = *mImpl->mVisualModel;
+
+    Length glyphCount = model.GetNumberOfGlyphs();
+    Length positionCount = model.GetNumberOfGlyphPositions();
+
+    DALI_ASSERT_DEBUG( positionCount <= glyphCount && "Invalid glyph positions in Model" );
+
+    return (positionCount < glyphCount) ? positionCount : glyphCount;
   }
 
   return 0;