Merge base & optional

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / image-view / masked-image-view-impl.h

diff --git a/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h b/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h
index ea213f5..a1c8285 100644 (file)
--- a/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h
+++ b/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h
@@ -1,24 +1,29 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_MASKED_IMAGE_VIEW_H__
 #define __DALI_TOOLKIT_INTERNAL_MASKED_IMAGE_VIEW_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/actors/image-actor.h>
+#include <dali/public-api/render-tasks/render-task.h>
+#include <dali/public-api/images/frame-buffer-image.h>
 
 // INTERNAL INCLUDES
-#include <dali/dali.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/image-view/masked-image-view.h>
 
@@ -34,7 +39,7 @@ namespace Internal
 /**
  * @copydoc Dali::Toolkit::MaskedImageView
  */
-class MaskedImageView : public ControlImpl
+class MaskedImageView : public Control
 {
 public:
 
@@ -130,14 +135,6 @@ public:
   ImageRotation GetSourceRotation() const;
 
   /**
-   * @copydoc Dali::Toolkit::MaskedImageView::RenderFinishedSignal
-   */
-  Dali::RenderTask::RenderTaskSignalV2& RenderFinishedSignal()
-  {
-    return mRenderTask.FinishedSignal();
-  }
-
-  /**
    * @copydoc Dali::Toolkit::MaskedImageView::MaskFinishedSignal
    */
   Dali::Toolkit::MaskedImageView::MaskedImageViewSignal& MaskFinishedSignal();
@@ -152,12 +149,12 @@ protected:
   /**
    * Helper for edit mode.
    */
-  void OnPan( Actor source, PanGesture gesture );
+  void OnPan( Actor source, const PanGesture& gesture );
 
   /**
    * Helper for edit mode.
    */
-  void OnPinch( Actor actor, PinchGesture pinch );
+  void OnPinch( Actor actor, const PinchGesture& pinch );
 
   /**
    * Construct a new MaskedImageView.
@@ -188,6 +185,12 @@ protected:
    */
   virtual ~MaskedImageView();
 
+  /**
+   *
+   * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& targetSize )
+   */
+  virtual void OnControlSizeSet( const Vector3& targetSize );
+
 private:
 
   // Undefined