Merge "Add FittingMode for image" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / filters / image-filter.cpp

diff --git a/dali-toolkit/internal/filters/image-filter.cpp b/dali-toolkit/internal/filters/image-filter.cpp
index f564c96..c33cbfe 100644 (file)
--- a/dali-toolkit/internal/filters/image-filter.cpp
+++ b/dali-toolkit/internal/filters/image-filter.cpp
@@ -51,14 +51,14 @@ void ImageFilter::SetRefreshOnDemand( bool onDemand )
   mRefreshOnDemand = onDemand;
 }
 
-void ImageFilter::SetInputImage( Image image )
+void ImageFilter::SetInputTexture( Texture texture )
 {
-  mInputImage = image;
+  mInputTexture = texture;
 }
 
-void ImageFilter::SetOutputImage( FrameBufferImage image )
+void ImageFilter::SetOutputFrameBuffer( FrameBuffer frameBuffer )
 {
-  mOutputImage = image;
+  mOutputFrameBuffer = frameBuffer;
 }
 
 void ImageFilter::SetSize( const Vector2& size )
@@ -121,7 +121,7 @@ void ImageFilter::SetupCamera()
   {
     // create a camera for the render task, corresponding to its render target size
     mCameraActor = CameraActor::New(mTargetSize);
-    mCameraActor.SetParentOrigin(ParentOrigin::CENTER);
+    mCameraActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
     mCameraActor.SetInvertYAxis( true );
     mRootActor.Add( mCameraActor );
   }