Merge "Merge branch 'devel/new_mesh' into devel/master" into devel/master

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

diff --git a/dali/public-api/images/frame-buffer-image.cpp b/dali/public-api/images/frame-buffer-image.cpp
index fe5f9c3..33b7802 100644 (file)
--- a/dali/public-api/images/frame-buffer-image.cpp
+++ b/dali/public-api/images/frame-buffer-image.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 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.
@@ -32,7 +32,7 @@ FrameBufferImage::FrameBufferImage()
 }
 
 FrameBufferImage::FrameBufferImage(Internal::FrameBufferImage* internal)
-  : Image(internal)
+: Image(internal)
 {
 }
 
@@ -51,13 +51,6 @@ FrameBufferImage& FrameBufferImage::operator=(const FrameBufferImage& rhs)
   return *this;
 }
 
-FrameBufferImage& FrameBufferImage::operator=(BaseHandle::NullType* rhs)
-{
-  DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle");
-  Reset();
-  return *this;
-}
-
 FrameBufferImage FrameBufferImage::New(unsigned int width, unsigned int height, Pixel::Format pixelformat)
 {
   Dali::Vector2 stageSize = Stage::GetCurrent().GetSize();
@@ -65,7 +58,7 @@ FrameBufferImage FrameBufferImage::New(unsigned int width, unsigned int height,
     (0 == width) ? stageSize.width : width,
     (0 == height) ? stageSize.height : height,
     pixelformat,
-    Dali::Image::Never);
+    Dali::Image::NEVER);
 
   return FrameBufferImage(internal.Get());
 }
@@ -82,13 +75,13 @@ FrameBufferImage FrameBufferImage::New(unsigned int width, unsigned int height,
   return FrameBufferImage(internal.Get());
 }
 
-FrameBufferImage FrameBufferImage::New( NativeImage& image, ReleasePolicy releasePolicy )
+FrameBufferImage FrameBufferImage::New( NativeImageInterface& image, ReleasePolicy releasePolicy )
 {
   Internal::FrameBufferImagePtr internal = Internal::FrameBufferImage::New( image, releasePolicy );
   return FrameBufferImage(internal.Get());
 }
 
-FrameBufferImage FrameBufferImage::New( NativeImage& image )
+FrameBufferImage FrameBufferImage::New( NativeImageInterface& image )
 {
   Internal::FrameBufferImagePtr internal = Internal::FrameBufferImage::New( image );
   return FrameBufferImage(internal.Get());