Revert "Revert "Revert "[4.0] Exposing Exif Image metadata"""

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

diff --git a/platform-abstractions/tizen/image-loaders/loader-wbmp.cpp b/platform-abstractions/tizen/image-loaders/loader-wbmp.cpp
index 44560bb..4a176ef 100755 (executable)
--- a/platform-abstractions/tizen/image-loaders/loader-wbmp.cpp
+++ b/platform-abstractions/tizen/image-loaders/loader-wbmp.cpp
@@ -25,11 +25,13 @@
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
-#include <adaptors/devel-api/adaptor-framework/pixel-buffer.h>
+#include <dali/integration-api/bitmap.h>
+#include <dali/public-api/common/dali-vector.h>
 
 namespace Dali
 {
-
+using Integration::Bitmap;
+using Dali::Integration::PixelBuffer;
 namespace TizenPlatform
 {
 
@@ -90,7 +92,7 @@ int extractMultiByteInteger(unsigned int *data, void *map, size_t length, size_t
 
 }// end unnamed namespace
 
-bool LoadBitmapFromWbmp( const ImageLoader::Input& input, Dali::Devel::PixelBuffer& bitmap )
+bool LoadBitmapFromWbmp( const ImageLoader::Input& input, Integration::Bitmap& bitmap )
 {
   FILE* const fp = input.file;
   if(fp == NULL)
@@ -100,6 +102,7 @@ bool LoadBitmapFromWbmp( const ImageLoader::Input& input, Dali::Devel::PixelBuff
   }
   Dali::Vector<unsigned char> map;
   Dali::Vector<unsigned char> surface;//unsigned int
+  PixelBuffer* pixels = NULL;
   size_t position = 0;
 
   unsigned int w, h;
@@ -203,7 +206,7 @@ bool LoadBitmapFromWbmp( const ImageLoader::Input& input, Dali::Devel::PixelBuff
       cur++;
     }
   }
-  auto pixels = (bitmap = Dali::Devel::PixelBuffer::New(w, h, Pixel::L8)).GetBuffer();
+  pixels = bitmap.GetPackedPixelsProfile()->ReserveBuffer(Pixel::L8, w, h);//Pixel::RGBA8888
 
   memcpy( pixels, &surface[0], w * h ); //w * h * 4