Merge "fix buffer GpuBuffer" into devel/master

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

diff --git a/dali/internal/event/images/image-impl.cpp b/dali/internal/event/images/image-impl.cpp
index 78cf0d3..4e3fa1e 100644 (file)
--- a/dali/internal/event/images/image-impl.cpp
+++ b/dali/internal/event/images/image-impl.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali/internal/event/images/image-impl.h>
 
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/object/type-registry.h>
@@ -39,28 +42,14 @@ namespace Internal
 namespace
 {
 
-TypeRegistration mType( typeid(Dali::Image), typeid(Dali::BaseHandle), NULL );
-
-Dali::SignalConnectorType signalConnector2(mType, Dali::Image::SIGNAL_IMAGE_UPLOADED, &Image::DoConnectSignal);
+// Signals
 
-}
+const char* const SIGNAL_IMAGE_UPLOADED = "uploaded";
 
-ImagePtr Image::New( NativeImage& nativeImg )
-{
-  ImagePtr image = new Image;
-  image->Initialize();
+TypeRegistration mType( typeid( Dali::Image ), typeid( Dali::BaseHandle ), NULL );
 
-  ResourceClient &resourceClient = ThreadLocalStorage::Get().GetResourceClient();
+Dali::SignalConnectorType signalConnector1( mType, SIGNAL_IMAGE_UPLOADED, &Image::DoConnectSignal );
 
-  image->mWidth  = nativeImg.GetWidth();
-  image->mHeight = nativeImg.GetHeight();
-
-  const ResourceTicketPtr& ticket = resourceClient.AddNativeImage( nativeImg );
-  DALI_ASSERT_DEBUG( dynamic_cast<ImageTicket*>( ticket.Get() ) && "Resource ticket not ImageTicket subclass for image resource.\n" );
-  image->mTicket = static_cast<ImageTicket*>(ticket.Get());
-  image->mTicket->AddObserver( *image );
-
-  return image;
 }
 
 bool Image::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
@@ -69,7 +58,7 @@ bool Image::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tra
   DALI_ASSERT_DEBUG( dynamic_cast<Image*>( object ) && "Resource ticket not ImageTicket subclass for image resource.\n" );
   Image* image = static_cast<Image*>(object);
 
-  if(Dali::Image::SIGNAL_IMAGE_UPLOADED == signalName)
+  if( 0 == strcmp( signalName.c_str(), SIGNAL_IMAGE_UPLOADED ) )
   {
     image->UploadedSignal().Connect( tracker, functor );
   }
@@ -104,16 +93,6 @@ void Image::ResourceUploaded(const ResourceTicket& ticket)
   mUploaded.Emit( Dali::Image( this ) );
 }
 
-void Image::ResourceSavingSucceeded( const ResourceTicket& ticket )
-{
-  // do nothing
-}
-
-void Image::ResourceSavingFailed( const ResourceTicket& ticket )
-{
-  // do nothing
-}
-
 unsigned int Image::GetWidth() const
 {
   return mWidth;