[3.0] Remove/move experimental features

[platform/core/uifw/dali-core.git] / dali / internal / event / images / buffer-image-impl.cpp

diff --git a/dali/internal/event/images/buffer-image-impl.cpp b/dali/internal/event/images/buffer-image-impl.cpp
index e09a50b..2b82133 100644 (file)
--- a/dali/internal/event/images/buffer-image-impl.cpp
+++ b/dali/internal/event/images/buffer-image-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -42,10 +42,9 @@ TypeRegistration mType( typeid( Dali::BufferImage ), typeid( Dali::Image ), NULL
 
 BufferImagePtr BufferImage::New( unsigned int width,
                                  unsigned int height,
-                                 Pixel::Format pixelformat,
-                                 ReleasePolicy releasePol )
+                                 Pixel::Format pixelformat )
 {
-  BufferImagePtr internal = new BufferImage( width, height, pixelformat, releasePol );
+  BufferImagePtr internal = new BufferImage( width, height, pixelformat );
   internal->Initialize();
   return internal;
 }
@@ -54,20 +53,26 @@ BufferImagePtr BufferImage::New( PixelBuffer* pixBuf,
                                  unsigned int width,
                                  unsigned int height,
                                  Pixel::Format pixelformat,
-                                 unsigned int stride,
-                                 ReleasePolicy releasePol )
+                                 unsigned int stride )
 {
-  BufferImagePtr internal = new BufferImage( pixBuf, width, height, pixelformat, stride, releasePol );
+  BufferImagePtr internal = new BufferImage( pixBuf, width, height, pixelformat, stride );
   internal->Initialize();
   return internal;
 }
 
-BufferImage::BufferImage(unsigned int width, unsigned int height, Pixel::Format pixelformat, ReleasePolicy releasePol)
-: Image(releasePol),
-  mInternalBuffer(NULL),
-  mExternalBuffer(NULL)
+BufferImage::BufferImage(unsigned int width, unsigned int height, Pixel::Format pixelformat)
+: Image(),
+  mInternalBuffer( NULL ),
+  mExternalBuffer( NULL ),
+  mResourceClient( NULL ),
+  mBufferSize( 0 ),
+  mByteStride( 0 ),
+  mBytesPerPixel( 0 ),
+  mBufferWidth( 0 ),
+  mPixelFormat( pixelformat ),
+  mResourcePolicy( ResourcePolicy::OWNED_DISCARD )
 {
-  SetupBuffer( width, height, pixelformat, width, releasePol );
+  SetupBuffer( width, height, pixelformat, width );
 
   // Allocate a persistent internal buffer
   mInternalBuffer = new PixelBuffer[ mBufferSize ];
@@ -77,25 +82,36 @@ BufferImage::BufferImage(PixelBuffer* pixBuf,
                          unsigned int width,
                          unsigned int height,
                          Pixel::Format pixelformat,
-                         unsigned int stride,
-                         ReleasePolicy releasePol )
-: Image(releasePol),
-  mInternalBuffer(NULL),
-  mExternalBuffer(pixBuf)
-{
-  SetupBuffer( width, height, pixelformat, stride ? stride: width, releasePol );
+                         unsigned int stride)
+: Image(),
+  mInternalBuffer( NULL ),
+  mExternalBuffer( pixBuf ),
+  mResourceClient( NULL ),
+  mBufferSize( 0 ),
+  mByteStride( 0 ),
+  mBytesPerPixel( 0 ),
+  mBufferWidth( 0 ),
+  mPixelFormat( pixelformat ),
+  mResourcePolicy( ResourcePolicy::OWNED_DISCARD )
+{
+  SetupBuffer( width, height, pixelformat, stride ? stride: width );
 }
 
 BufferImage::~BufferImage()
 {
+  if( mTicket )
+  {
+    mTicket->RemoveObserver(*this);
+    mTicket.Reset();
+  }
+
   delete[] mInternalBuffer;
 }
 
 void BufferImage::SetupBuffer( unsigned int width,
                                unsigned int height,
                                Pixel::Format pixelformat,
-                               unsigned int byteStride,
-                               ReleasePolicy releasePol )
+                               unsigned int byteStride )
 {
   ThreadLocalStorage& tls = ThreadLocalStorage::Get();
   mResourceClient = &tls.GetResourceClient();
@@ -108,7 +124,7 @@ void BufferImage::SetupBuffer( unsigned int width,
   mBufferSize = height * mByteStride;
 
   // Respect the desired release policy
-  mResourcePolicy = releasePol == Dali::Image::UNUSED ? ResourcePolicy::OWNED_DISCARD : ResourcePolicy::OWNED_RETAIN;
+  mResourcePolicy = ResourcePolicy::OWNED_RETAIN;
 }
 
 bool BufferImage::IsDataExternal() const
@@ -209,7 +225,7 @@ void BufferImage::UpdateBufferArea( PixelBuffer* src, PixelBuffer* dest, const R
 
 void BufferImage::Connect()
 {
-  if ( !mConnectionCount++ )
+  if ( !mConnectionCount++ && !mTicket )
   {
     RectArea area;
     Update( area );
@@ -218,14 +234,7 @@ void BufferImage::Connect()
 
 void BufferImage::Disconnect()
 {
-  if ( mTicket )
-  {
-    if ( !( --mConnectionCount ) && mReleasePolicy == Dali::Image::UNUSED )
-    {
-      mTicket->RemoveObserver(*this);
-      mTicket.Reset();
-    }
-  }
+  --mConnectionCount;
 }
 
 } // namespace Internal