From: Victor Cebollada <v.cebollada@samsung.com>
Date: Tue, 10 May 2016 10:29:54 +0000 (+0100)
Subject: Text::Controller - Fix a crash when the point size property is changed in a text... 
X-Git-Tag: dali_1.1.34~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fda52f710b0432dbb1c8a3855e650bc6af0a7d8b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

Text::Controller - Fix a crash when the point size property is changed in a text-label.

Change-Id: Iba4c34f6e1450e03e361bd70b8e2543f1e53dc7d
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
---

diff --git a/dali-toolkit/internal/text/text-controller-impl.cpp b/dali-toolkit/internal/text/text-controller-impl.cpp
index d863268..c3b2346 100644
--- a/dali-toolkit/internal/text/text-controller-impl.cpp
+++ b/dali-toolkit/internal/text/text-controller-impl.cpp
@@ -655,7 +655,7 @@ bool Controller::Impl::UpdateModel( OperationsMask operationsRequired )
   if( mTextUpdateInfo.mClearAll ||
       ( 0u != paragraphCharacters ) )
   {
-    ClearModelData( startIndex, startIndex + ( ( paragraphCharacters > 0u ) ? paragraphCharacters - 1u : 0u ), operationsRequired );
+    ClearModelData( startIndex, startIndex + ( ( paragraphCharacters > 0u ) ? paragraphCharacters - 1u : 0u ), operations );
   }
 
   mTextUpdateInfo.mClearAll = false;
@@ -833,7 +833,7 @@ bool Controller::Impl::UpdateModel( OperationsMask operationsRequired )
     updated = true;
   }
 
-  if( NO_OPERATION != ( COLOR & operationsRequired ) )
+  if( NO_OPERATION != ( COLOR & operations ) )
   {
     // Set the color runs in glyphs.
     SetColorSegmentationInfo( mLogicalModel->mColorRuns,