Merge "Use FileStream API in gltf-loader." into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / gaussian-blur-view / gaussian-blur-view.cpp

diff --git a/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.cpp b/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.cpp
index 2001939..3d71e4b 100644 (file)
--- a/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.cpp
+++ b/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.cpp
@@ -106,7 +106,7 @@ void GaussianBlurView::Deactivate()
   GetImpl(*this).Deactivate();
 }
 
-void GaussianBlurView::SetUserImageAndOutputRenderTarget(Image inputImage, FrameBufferImage outputRenderTarget)
+void GaussianBlurView::SetUserImageAndOutputRenderTarget(Texture inputImage, FrameBuffer outputRenderTarget)
 {
   GetImpl(*this).SetUserImageAndOutputRenderTarget(inputImage, outputRenderTarget);
 }
@@ -116,7 +116,7 @@ Property::Index GaussianBlurView::GetBlurStrengthPropertyIndex() const
   return GetImpl(*this).GetBlurStrengthPropertyIndex();
 }
 
-FrameBufferImage GaussianBlurView::GetBlurredRenderTarget() const
+FrameBuffer GaussianBlurView::GetBlurredRenderTarget() const
 {
   return GetImpl(*this).GetBlurredRenderTarget();
 }