X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.cpp;h=03229f9e9ca17840e82aaa17e39b000fa18ab304;hb=d2cc1da3aea2842d9de3e2f5288d768be711fa5b;hp=3eb0144a036c8b3184b40f501bc5c797f6971814;hpb=e84f2b4052f5a042c6a08d02b87e771bac5ddf44;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
index 3eb0144..03229f9 100644
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -6,7 +6,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/images/resource-image.h>
 #include <dali/public-api/object/type-registry.h>
-#include <dali/devel-api/object/type-registry-helper.h>
+#include <dali/public-api/object/type-registry-helper.h>
 #include <dali/devel-api/scripting/scripting.h>
 
 // INTERNAL INCLUDES
@@ -44,8 +44,7 @@ DALI_TYPE_REGISTRATION_END()
 using namespace Dali;
 
 ImageView::ImageView()
-: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ),
-  mPremultipledAlphaEnabled( false )
+: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) )
 {
 }
 
@@ -142,6 +141,11 @@ void ImageView::SetImage( const std::string& url, ImageDimensions size )
   }
 }
 
+Image ImageView::GetImage() const
+{
+  return mImage;
+}
+
 void ImageView::EnablePreMultipliedAlpha( bool preMultipled )
 {
   if( mRenderer )
@@ -300,10 +304,10 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr
 
       case Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA:
       {
-        bool IsPre;
-        if( value.Get( IsPre ) )
+        bool isPre;
+        if( value.Get( isPre ) )
         {
-          GetImpl(imageView).EnablePreMultipliedAlpha( IsPre );
+          GetImpl(imageView).EnablePreMultipliedAlpha( isPre );
         }
         break;
       }