Text::Controller - Fix a crash when the point size property is changed in a text... 18/68918/2
authorVictor Cebollada <v.cebollada@samsung.com>
Tue, 10 May 2016 10:29:54 +0000 (11:29 +0100)
committerVíctor Cebollada <v.cebollada@samsung.com>
Tue, 10 May 2016 10:32:23 +0000 (03:32 -0700)
Change-Id: Iba4c34f6e1450e03e361bd70b8e2543f1e53dc7d
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
dali-toolkit/internal/text/text-controller-impl.cpp

index d863268..c3b2346 100644 (file)
@@ -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,