X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Flayouting%2Fmeasured-size.h;h=3e38a1ea0bdc04ef3065edc44fe7c8771a666d4e;hp=ff937cf9d9c35a230b1309c3098bd11b36425e18;hb=c87446dd57403afc21d11544d162df31c00922ee;hpb=16634ab902b66b0ba2f3f39af8ff6ed25b5f7115

diff --git a/dali-toolkit/devel-api/layouting/measured-size.h b/dali-toolkit/devel-api/layouting/measured-size.h
index ff937cf..3e38a1e 100644
--- a/dali-toolkit/devel-api/layouting/measured-size.h
+++ b/dali-toolkit/devel-api/layouting/measured-size.h
@@ -39,7 +39,8 @@ public:
   };
 
   MeasuredSize()
-  : mMeasuredSize( 0u )
+  : mMeasuredSize( 0u ),
+    mState ( MeasuredSize::State::MEASURED_SIZE_OK )
   {
   }
 
@@ -59,8 +60,11 @@ public:
 
   MeasuredSize& operator=( const MeasuredSize& rhs )
   {
-    this->mMeasuredSize = rhs.mMeasuredSize;
-    this->mState = rhs.mState;
+    if( this != &rhs )
+    {
+      this->mMeasuredSize = rhs.mMeasuredSize;
+      this->mState = rhs.mState;
+    }
     return *this;
   }