X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ffilters%2Femboss-filter.h;h=122c70ceb3cb0d99d917e6a1d4016751d5cdfd8f;hp=2c811f1b4878a8b3030d8b6a3aaa3da0a95dff03;hb=0e1683ef848d1d877e26633609fa95e0d2ab36b5;hpb=b154e74ada0754b5b47adcdffcf4a70df43ebbec

diff --git a/dali-toolkit/internal/filters/emboss-filter.h b/dali-toolkit/internal/filters/emboss-filter.h
index 2c811f1..122c70c 100644
--- a/dali-toolkit/internal/filters/emboss-filter.h
+++ b/dali-toolkit/internal/filters/emboss-filter.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_EMBOSS_FILTER_H__
-#define __DALI_TOOLKIT_INTERNAL_EMBOSS_FILTER_H__
+#ifndef DALI_TOOLKIT_INTERNAL_EMBOSS_FILTER_H
+#define DALI_TOOLKIT_INTERNAL_EMBOSS_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.
@@ -20,8 +20,8 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/render-tasks/render-task.h>
-#include <dali-toolkit/public-api/controls/image-view/image-view.h>
-#include <dali-toolkit/devel-api/controls/renderer-factory/control-renderer.h>
+#include <dali/public-api/rendering/frame-buffer.h>
+#include <dali/public-api/rendering/renderer.h>
 
 // INTERNAL INCLUDES
 #include "image-filter.h"
@@ -53,16 +53,16 @@ public:
 
 public: // From ImageFilter
   /// @copydoc Dali::Toolkit::Internal::ImageFilter::Enable
-  virtual void Enable();
+  void Enable() override;
 
   /// @copydoc Dali::Toolkit::Internal::ImageFilter::Disable
-  virtual void Disable();
+  void Disable() override;
 
   /// @copydoc Dali::Toolkit::Internal::ImageFilter::Refresh
-  virtual void Refresh();
+  void Refresh() override;
 
   /// @copydoc Dali::Toolkit::Internal::ImageFilter::SetSize
-  virtual void SetSize( const Vector2& size );
+  void SetSize( const Vector2& size ) override;
 
 private:
   /**
@@ -76,16 +76,16 @@ private:
 
 private: // Attributes
 
-  RenderTask         mRenderTaskForEmboss1;
-  RenderTask         mRenderTaskForEmboss2;
-  RenderTask         mRenderTaskForOutput;
-  FrameBufferImage   mImageForEmboss1;
-  FrameBufferImage   mImageForEmboss2;
-  Toolkit::ImageView mActorForInput1;
-  Toolkit::ImageView mActorForInput2;
-  Toolkit::ControlRenderer mRendererForEmboss1;
-  Toolkit::ControlRenderer mRendererForEmboss2;
-  Actor              mActorForComposite;
+  RenderTask            mRenderTaskForEmboss1;
+  RenderTask            mRenderTaskForEmboss2;
+  RenderTask            mRenderTaskForOutput;
+  FrameBuffer           mFrameBufferForEmboss1;
+  FrameBuffer           mFrameBufferForEmboss2;
+  Actor                 mActorForInput1;
+  Actor                 mActorForInput2;
+  Renderer              mRendererForEmboss1;
+  Renderer              mRendererForEmboss2;
+  Actor                 mActorForComposite;
 }; // class EmbossFilter
 
 } // namespace Internal
@@ -94,5 +94,5 @@ private: // Attributes
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_INTERNAL_EMBOSS_FILTER_H__
+#endif // DALI_TOOLKIT_INTERNAL_EMBOSS_FILTER_H