[dali_1.4.21] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / filters / blur-two-pass-filter.h

diff --git a/dali-toolkit/internal/filters/blur-two-pass-filter.h b/dali-toolkit/internal/filters/blur-two-pass-filter.h
index 1e723b9..438761d 100644 (file)
--- a/dali-toolkit/internal/filters/blur-two-pass-filter.h
+++ b/dali-toolkit/internal/filters/blur-two-pass-filter.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_BLUR_TWO_PASS_FILTER_H__
-#define __DALI_TOOLKIT_INTERNAL_BLUR_TWO_PASS_FILTER_H__
+#ifndef DALI_TOOLKIT_INTERNAL_BLUR_TWO_PASS_FILTER_H
+#define DALI_TOOLKIT_INTERNAL_BLUR_TWO_PASS_FILTER_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,8 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/actors/camera-actor.h>
-#include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/render-tasks/render-task.h>
-#include <dali/public-api/shader-effects/shader-effect.h>
+#include <dali-toolkit/public-api/controls/image-view/image-view.h>
 
 // INTERNAL INCLUDES
 #include "image-filter.h"
@@ -79,10 +77,6 @@ public: // From ImageFilter
   Handle GetHandleForAnimateBlurStrength();
 
 private:
-  /**
-   * Setup position and parameters for camera
-   */
-  void SetupCamera();
 
   /**
    * Setup render tasks for blur
@@ -95,26 +89,21 @@ private:
 
 private: // Attributes
 
-  CameraActor      mCameraForBlur;
-
   // To perform horizontal blur from mInputImage to mImageForHorz
-  RenderTask       mRenderTaskForHorz;
-  ImageActor       mActorForInput;
-  FrameBufferImage mImageForHorz;
-  ShaderEffect     mShaderForHorz;
+  RenderTask         mRenderTaskForHorz;
+  Toolkit::ImageView mActorForInput;
+  FrameBufferImage   mImageForHorz;
 
   // To perform vertical blur from mImageForHorz to mOutputImage
-  RenderTask       mRenderTaskForVert;
-  ImageActor       mActorForHorz;
-  ShaderEffect     mShaderForVert;
-  FrameBufferImage mBlurredImage;
+  RenderTask         mRenderTaskForVert;
+  Toolkit::ImageView mActorForHorz;
+  FrameBufferImage   mBlurredImage;
 
   // To blend the blurred image and input image according to the blur strength
-  RenderTask       mRenderTaskForBlending;
-  ImageActor       mActorForBlending;
-  Actor            mRootActorForBlending;
-  ShaderEffect     mShaderForBlending;
-  Property::Index  mBlurStrengthPropertyIndex;
+  RenderTask         mRenderTaskForBlending;
+  Toolkit::ImageView mActorForBlending;
+  Actor              mRootActorForBlending;
+  Property::Index    mBlurStrengthPropertyIndex;
 
 }; // class BlurTwoPassFilter
 
@@ -124,5 +113,5 @@ private: // Attributes
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_INTERNAL_BLUR_TWO_PASS_FILTER_H__
+#endif // DALI_TOOLKIT_INTERNAL_BLUR_TWO_PASS_FILTER_H