Merge "DALi Version 1.0.30" into tizen

[platform/core/uifw/dali-core.git] / dali / public-api / images / frame-buffer-image.h

diff --git a/dali/public-api/images/frame-buffer-image.h b/dali/public-api/images/frame-buffer-image.h
index 41b5c53..b5fca0b 100644 (file)
--- a/dali/public-api/images/frame-buffer-image.h
+++ b/dali/public-api/images/frame-buffer-image.h
@@ -20,9 +20,9 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/images/image.h>
-#include <dali/public-api/math/rect.h>
+#include <dali/public-api/images/pixel.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -36,7 +36,7 @@ class FrameBufferImage;
  * The FrameBufferImage can then be used with an ImageActor (with optional shader
  * effects) and rendered to the screen.
  */
-class FrameBufferImage : public Image
+class DALI_IMPORT_API FrameBufferImage : public Image
 {
 public:
   /**
@@ -123,9 +123,19 @@ public:
   ~FrameBufferImage();
 
   /**
-   * @copydoc Dali::BaseHandle::operator=
+   * @brief This copy constructor is required for (smart) pointer semantics.
+   *
+   * @param [in] handle A reference to the copied handle
+   */
+  FrameBufferImage(const FrameBufferImage& handle);
+
+  /**
+   * @brief This assignment operator is required for (smart) pointer semantics.
+   *
+   * @param [in] rhs  A reference to the copied handle
+   * @return A reference to this
    */
-  using BaseHandle::operator=;
+  FrameBufferImage& operator=(const FrameBufferImage& rhs);
 
 public: // Not intended for application developers