[dali_1.2.26] Merge branch 'devel/master'

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

diff --git a/dali/internal/event/images/nine-patch-image-impl.cpp b/dali/internal/event/images/nine-patch-image-impl.cpp
index e165330..8909749 100644 (file)
--- a/dali/internal/event/images/nine-patch-image-impl.cpp
+++ b/dali/internal/event/images/nine-patch-image-impl.cpp
@@ -25,9 +25,7 @@
 #include <dali/public-api/object/type-registry.h>
 #include <dali/integration-api/bitmap.h>
 #include <dali/internal/event/common/thread-local-storage.h>
-#include <dali/internal/event/resources/resource-client.h>
 #include <dali/internal/update/manager/update-manager.h>
-#include <dali/internal/event/images/image-factory.h>
 #include <dali/integration-api/platform-abstraction.h>
 #include <dali/integration-api/resource-types.h>
 #include <dali/integration-api/resource-cache.h>
@@ -179,7 +177,6 @@ NinePatchImage::NinePatchImage( const std::string& filename )
 {
   mUrl = filename;
   ThreadLocalStorage& tls = ThreadLocalStorage::Get();
-  mResourceClient = &tls.GetResourceClient();
 
   Integration::PlatformAbstraction& platformAbstraction = tls.GetPlatformAbstraction();
   Integration::BitmapResourceType resourceType;
@@ -189,8 +186,16 @@ NinePatchImage::NinePatchImage( const std::string& filename )
   if( resource )
   {
     mBitmap = static_cast<Integration::Bitmap*>( resource.Get());
+
     mWidth = mBitmap->GetImageWidth();
     mHeight = mBitmap->GetImageHeight();
+    mTexture = NewTexture::New( Dali::TextureType::TEXTURE_2D, mBitmap->GetPixelFormat(), mWidth, mHeight );
+
+    size_t bufferSize = mBitmap->GetBufferSize();
+    unsigned char* buffer = new unsigned char[bufferSize];
+    memcpy( buffer, mBitmap->GetBuffer(), bufferSize );
+    PixelDataPtr pixelData = PixelData::New( buffer, bufferSize, mWidth, mHeight, mBitmap->GetPixelFormat(), Dali::PixelData::DELETE_ARRAY );
+    mTexture->Upload( pixelData );
   }
   else
   {
@@ -281,30 +286,6 @@ const std::string& NinePatchImage::GetUrl() const
   return mUrl;
 }
 
-void NinePatchImage::Connect()
-{
-  if( !mTicket )
-  {
-    if( mBitmap )
-    {
-      const ImageTicketPtr& t = mResourceClient->AddBitmapImage(mBitmap.Get());
-      mTicket = t.Get();
-      mTicket->AddObserver(*this);
-    }
-  }
-
-  ++mConnectionCount;
-}
-
-void NinePatchImage::Disconnect()
-{
-  if( mConnectionCount > 0 )
-  {
-    --mConnectionCount;
-  }
-}
-
-
 void NinePatchImage::ParseBorders()
 {
   if( !mBitmap )