X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=platform-abstractions%2Ftizen%2Fimage-loaders%2Floader-wbmp.cpp;h=4a176ef3b1c3055b75fb08f3eb6192e17db79c79;hb=efbfe41145cb178ee71f073f74f1e98e2485fffc;hp=44560bbbeb4dc1cbbe2d57f55cd1eacf53a776e0;hpb=f4b05fe51ddba1d7d2035103ef3cfcd1d4741d3c;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/platform-abstractions/tizen/image-loaders/loader-wbmp.cpp b/platform-abstractions/tizen/image-loaders/loader-wbmp.cpp
index 44560bb..4a176ef 100755
--- 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