X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=platform-abstractions%2Ftizen%2Fimage-loaders%2Fimage-loader.cpp;h=16a012e46aca43e18c7d73063f7158134b1df52c;hb=29700e5d950c37672475098e30b946aadcdfb86b;hp=d7a6da154d648ef83c5c6917bdffda7937635b8e;hpb=436f00b5cba493989d23b2b7e54bc655e5b009f0;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/platform-abstractions/tizen/image-loaders/image-loader.cpp b/platform-abstractions/tizen/image-loaders/image-loader.cpp
index d7a6da1..16a012e 100644
--- a/platform-abstractions/tizen/image-loaders/image-loader.cpp
+++ b/platform-abstractions/tizen/image-loaders/image-loader.cpp
@@ -17,8 +17,8 @@
 #include "image-loader.h"
 
 #include <dali/devel-api/common/ref-counted-dali-vector.h>
-#include <adaptors/common/pixel-buffer-impl.h>
-
+#include <dali/integration-api/bitmap.h>
+#include <dali/integration-api/debug.h>
 
 #include "loader-astc.h"
 #include "loader-bmp.h"
@@ -29,6 +29,7 @@
 #include "loader-png.h"
 #include "loader-wbmp.h"
 #include "image-operations.h"
+#include "image-loader-input.h"
 #include "portable/file-reader.h"
 
 using namespace Dali::Integration;
@@ -40,7 +41,7 @@ namespace TizenPlatform
 
 namespace
 {
-typedef bool (*LoadBitmapFunction)( const ImageLoader::Input& input, Dali::Devel::PixelBuffer& pixelData );
+typedef bool (*LoadBitmapFunction)( const ImageLoader::Input& input, Integration::Bitmap& bitmap );
 typedef bool (*LoadBitmapHeaderFunction)( const ImageLoader::Input& input, unsigned int& width, unsigned int& height );
 
 #if defined(DEBUG_ENABLED)
@@ -251,17 +252,17 @@ bool GetBitmapLoaderFunctions( FILE *fp,
 namespace ImageLoader
 {
 
-bool ConvertStreamToBitmap( const BitmapResourceType& resource, std::string path, FILE * const fp, Dali::Devel::PixelBuffer& pixelBuffer )
+bool ConvertStreamToBitmap( const BitmapResourceType& resource, std::string path, FILE * const fp, BitmapPtr& ptr )
 {
   DALI_LOG_TRACE_METHOD( gLogFilter );
 
   bool result = false;
+  BitmapPtr bitmap = 0;
 
   if (fp != NULL)
   {
     LoadBitmapFunction function;
     LoadBitmapHeaderFunction header;
-
     Bitmap::Profile profile;
 
     if ( GetBitmapLoaderFunctions( fp,
@@ -270,19 +271,22 @@ bool ConvertStreamToBitmap( const BitmapResourceType& resource, std::string path
                                    header,
                                    profile ) )
     {
+      bitmap = Bitmap::New( profile, ResourcePolicy::OWNED_DISCARD );
+
+      DALI_LOG_SET_OBJECT_STRING( bitmap, path );
       const ScalingParameters scalingParameters( resource.size, resource.scalingMode, resource.samplingMode );
       const ImageLoader::Input input( fp, scalingParameters, resource.orientationCorrection );
 
       // Run the image type decoder:
-      result = function( input, pixelBuffer );
+      result = function( input, *bitmap );
 
       if (!result)
       {
         DALI_LOG_WARNING( "Unable to convert %s\n", path.c_str() );
-        pixelBuffer.Reset();
+        bitmap = 0;
       }
 
-      pixelBuffer = Internal::Platform::ApplyAttributesToBitmap( pixelBuffer, resource.size, resource.scalingMode, resource.samplingMode );
+      bitmap = Internal::Platform::ApplyAttributesToBitmap( bitmap, resource.size, resource.scalingMode, resource.samplingMode );
     }
     else
     {
@@ -290,40 +294,23 @@ bool ConvertStreamToBitmap( const BitmapResourceType& resource, std::string path
     }
   }
 
+  ptr.Reset( bitmap.Get() );
   return result;
 }
 
 ResourcePointer LoadImageSynchronously( const Integration::BitmapResourceType& resource, const std::string& path )
 {
   ResourcePointer result;
-  Dali::Devel::PixelBuffer bitmap;
+  BitmapPtr bitmap = 0;
 
   Internal::Platform::FileReader fileReader( path );
   FILE * const fp = fileReader.GetFile();
   if( fp != NULL )
   {
-    bool success = ConvertStreamToBitmap(resource, path, fp, bitmap);
-    if (success && bitmap)
+    bool success = ConvertStreamToBitmap( resource, path, fp, bitmap );
+    if( success && bitmap )
     {
-      Bitmap::Profile profile{Bitmap::Profile::BITMAP_2D_PACKED_PIXELS};
-
-      // For backward compatibility the Bitmap must be created
-      auto retval = Bitmap::New(profile, Dali::ResourcePolicy::OWNED_DISCARD);
-
-      DALI_LOG_SET_OBJECT_STRING( retval, path );
-
-      retval->GetPackedPixelsProfile()->ReserveBuffer(
-              bitmap.GetPixelFormat(),
-              bitmap.GetWidth(),
-              bitmap.GetHeight(),
-              bitmap.GetWidth(),
-              bitmap.GetHeight()
-            );
-
-      auto& impl = Dali::GetImplementation(bitmap);
-
-      std::copy( impl.GetBuffer(), impl.GetBuffer()+impl.GetBufferSize(), retval->GetBuffer());
-      result.Reset(retval);
+      result.Reset(bitmap.Get());
     }
   }
   return result;