Revert "[4.0] Exposing Exif Image metadata"

[platform/core/uifw/dali-adaptor.git] / platform-abstractions / tizen / image-loaders / loader-ico.cpp

diff --git a/platform-abstractions/tizen/image-loaders/loader-ico.cpp b/platform-abstractions/tizen/image-loaders/loader-ico.cpp
index 5078e8c..4a46931 100644 (file)
--- a/platform-abstractions/tizen/image-loaders/loader-ico.cpp
+++ b/platform-abstractions/tizen/image-loaders/loader-ico.cpp
@@ -56,10 +56,12 @@
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
-#include <adaptors/devel-api/adaptor-framework/pixel-buffer.h>
+#include <dali/integration-api/bitmap.h>
 
 namespace Dali
 {
+using Integration::Bitmap;
+using Dali::Integration::PixelBuffer;
 
 namespace TizenPlatform
 {
@@ -355,7 +357,7 @@ bool LoadIcoHeader( const ImageLoader::Input& input, unsigned int& width, unsign
   return true;
 }
 
-bool LoadBitmapFromIco( const ImageLoader::Input& input, Dali::Devel::PixelBuffer& bitmap )
+bool LoadBitmapFromIco( const ImageLoader::Input& input, Integration::Bitmap& bitmap )
 {
   IcoData chosen;
   Dali::Vector<unsigned char> map;
@@ -378,6 +380,7 @@ bool LoadBitmapFromIco( const ImageLoader::Input& input, Dali::Devel::PixelBuffe
 
   int diff_size = 0;
   unsigned int* pix;
+  PixelBuffer* pixels = NULL;
 
   size_t position = chosen.bmoffset;//22 == position
 
@@ -661,8 +664,7 @@ bool LoadBitmapFromIco( const ImageLoader::Input& input, Dali::Devel::PixelBuffe
     }
   }
 
-  bitmap = Dali::Devel::PixelBuffer::New(w, h, Pixel::Format::RGBA8888);
-  auto pixels = bitmap.GetBuffer();
+  pixels = bitmap.GetPackedPixelsProfile()->ReserveBuffer( Pixel::RGBA8888, w, h );
   memcpy( pixels, &surface[0], w * h * 4 );
 
   return true;