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 95b1dee..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:
   /**
@@ -137,16 +137,6 @@ public:
    */
   FrameBufferImage& operator=(const FrameBufferImage& rhs);
 
-  /**
-   * @brief This method is defined to allow assignment of the NULL value,
-   * and will throw an exception if passed any other value.
-   *
-   * Assigning to NULL is an alias for Reset().
-   * @param [in] rhs  A NULL pointer
-   * @return A reference to this handle
-   */
-  FrameBufferImage& operator=(BaseHandle::NullType* rhs);
-
 public: // Not intended for application developers
 
   explicit DALI_INTERNAL FrameBufferImage(Internal::FrameBufferImage*);