Merge "TextController - Update the text model." into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / filters / emboss-filter.h

diff --git a/dali-toolkit/internal/filters/emboss-filter.h b/dali-toolkit/internal/filters/emboss-filter.h
index 12511cf..2c811f1 100644 (file)
--- a/dali-toolkit/internal/filters/emboss-filter.h
+++ b/dali-toolkit/internal/filters/emboss-filter.h
@@ -1,26 +1,29 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_EMBOSS_FILTER_H__
 #define __DALI_TOOLKIT_INTERNAL_EMBOSS_FILTER_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // 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>
 
 // INTERNAL INCLUDES
-#include <dali/dali.h>
 #include "image-filter.h"
 
 namespace Dali
@@ -58,12 +61,10 @@ public: // From ImageFilter
   /// @copydoc Dali::Toolkit::Internal::ImageFilter::Refresh
   virtual void Refresh();
 
-private:
-  /**
-   * Setup position and parameters for camera
-   */
-  void SetupCamera();
+  /// @copydoc Dali::Toolkit::Internal::ImageFilter::SetSize
+  virtual void SetSize( const Vector2& size );
 
+private:
   /**
    * Setup render tasks for blur
    */
@@ -75,17 +76,16 @@ private:
 
 private: // Attributes
 
-  RenderTask       mRenderTaskForEmboss1;
-  RenderTask       mRenderTaskForEmboss2;
-  RenderTask       mRenderTaskForOutput;
-  FrameBufferImage mImageForEmboss1;
-  FrameBufferImage mImageForEmboss2;
-  CameraActor      mCameraActor;
-  ImageActor       mActorForInput1;
-  ImageActor       mActorForInput2;
-  ImageActor       mActorForEmboss1;
-  ImageActor       mActorForEmboss2;
-  Actor            mActorForComposite;
+  RenderTask         mRenderTaskForEmboss1;
+  RenderTask         mRenderTaskForEmboss2;
+  RenderTask         mRenderTaskForOutput;
+  FrameBufferImage   mImageForEmboss1;
+  FrameBufferImage   mImageForEmboss2;
+  Toolkit::ImageView mActorForInput1;
+  Toolkit::ImageView mActorForInput2;
+  Toolkit::ControlRenderer mRendererForEmboss1;
+  Toolkit::ControlRenderer mRendererForEmboss2;
+  Actor              mActorForComposite;
 }; // class EmbossFilter
 
 } // namespace Internal