[3.0] Remove/move experimental features

[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..5a97369 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.
@@ -31,8 +31,8 @@ FrameBufferImage::FrameBufferImage()
 {
 }
 
-FrameBufferImage::FrameBufferImage(Internal::FrameBufferImage* internal)
-  : Image(internal)
+FrameBufferImage::FrameBufferImage( Internal::FrameBufferImage* internal )
+: Image(internal)
 {
 }
 
@@ -40,55 +40,30 @@ FrameBufferImage::~FrameBufferImage()
 {
 }
 
-FrameBufferImage::FrameBufferImage(const FrameBufferImage& handle)
+FrameBufferImage::FrameBufferImage( const FrameBufferImage& handle )
 : Image(handle)
 {
 }
 
-FrameBufferImage& FrameBufferImage::operator=(const FrameBufferImage& rhs)
+FrameBufferImage& FrameBufferImage::operator=( const FrameBufferImage& rhs )
 {
   BaseHandle::operator=(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();
-  Internal::FrameBufferImagePtr internal = Internal::FrameBufferImage::New(
-    (0 == width) ? stageSize.width : width,
-    (0 == height) ? stageSize.height : height,
-    pixelformat,
-    Dali::Image::Never);
-
-  return FrameBufferImage(internal.Get());
-}
-
-FrameBufferImage FrameBufferImage::New(unsigned int width, unsigned int height, Pixel::Format pixelformat, ReleasePolicy releasePolicy)
+FrameBufferImage FrameBufferImage::New( unsigned int width, unsigned int height, Pixel::Format pixelformat, RenderBuffer::Format bufferformat )
 {
   Dali::Vector2 stageSize = Stage::GetCurrent().GetSize();
   Internal::FrameBufferImagePtr internal = Internal::FrameBufferImage::New(
     (0 == width) ? stageSize.width : width,
     (0 == height) ? stageSize.height : height,
     pixelformat,
-    releasePolicy);
+    bufferformat);
 
   return FrameBufferImage(internal.Get());
 }
 
-FrameBufferImage FrameBufferImage::New( NativeImage& 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());
@@ -96,7 +71,7 @@ FrameBufferImage FrameBufferImage::New( NativeImage& image )
 
 FrameBufferImage FrameBufferImage::DownCast( BaseHandle handle )
 {
-  return FrameBufferImage( dynamic_cast<Dali::Internal::FrameBufferImage*>(handle.GetObjectPtr()) );
+  return FrameBufferImage( dynamic_cast<Dali::Internal::FrameBufferImage*>( handle.GetObjectPtr() ) );
 }
 
 } // namespace Dali