Exposing Exif Image metadata

[platform/core/uifw/dali-adaptor.git] / adaptors / devel-api / adaptor-framework / image-loading.cpp

diff --git a/adaptors/devel-api/adaptor-framework/image-loading.cpp b/adaptors/devel-api/adaptor-framework/image-loading.cpp
index 2beb24d..88203fe 100644 (file)
--- a/adaptors/devel-api/adaptor-framework/image-loading.cpp
+++ b/adaptors/devel-api/adaptor-framework/image-loading.cpp
@@ -18,11 +18,14 @@
 #include "image-loading.h"
 
 // INTERNAL INCLUDES
+#include <dali/public-api/object/property-map.h>
 #include "image-loaders/image-loader.h"
 #include <resource-loader/network/file-download.h>
 #include <platform-abstractions/portable/file-reader.h>
 #include "pixel-buffer-impl.h"
 
+
+
 namespace Dali
 {
 
@@ -44,23 +47,11 @@ Devel::PixelBuffer LoadImageFromFile( const std::string& url, ImageDimensions si
   FILE * const fp = fileReader.GetFile();
   if( fp != NULL )
   {
-    Integration::BitmapPtr bitmap;
+    Dali::Devel::PixelBuffer bitmap;
     bool success = TizenPlatform::ImageLoader::ConvertStreamToBitmap( resourceType, url, fp, bitmap );
     if( success && bitmap )
     {
-      // Use bitmap->GetBufferOwnership() to transfer the buffer ownership
-      // to pixelData.  The destroy of bitmap will not release the buffer,
-      // instead, the pixelBuffer is responsible for releasing when its
-      // reference count falls to zero.
-      Internal::Adaptor::PixelBufferPtr pixelBufferImpl =
-        Internal::Adaptor::PixelBuffer::New( bitmap->GetBufferOwnership(),
-                                             bitmap->GetBufferSize(),
-                                             bitmap->GetImageWidth(),
-                                             bitmap->GetImageHeight(),
-                                             bitmap->GetPixelFormat() );
-
-      Dali::Devel::PixelBuffer pixelBuffer( pixelBufferImpl.Get() );
-      return pixelBuffer;
+      return bitmap;
     }
   }
   return Dali::Devel::PixelBuffer();
@@ -104,7 +95,7 @@ Devel::PixelBuffer DownloadImageSynchronously( const std::string& url, ImageDime
       FILE * const fp = fileReader.GetFile();
       if ( NULL != fp )
       {
-        Integration::BitmapPtr bitmap;
+        Dali::Devel::PixelBuffer bitmap;
         bool result = TizenPlatform::ImageLoader::ConvertStreamToBitmap(
           resourceType,
           url,
@@ -113,15 +104,7 @@ Devel::PixelBuffer DownloadImageSynchronously( const std::string& url, ImageDime
 
         if ( result && bitmap )
         {
-          Internal::Adaptor::PixelBufferPtr pixelBufferImpl =
-            Internal::Adaptor::PixelBuffer::New( bitmap->GetBufferOwnership(),
-                                                 bitmap->GetBufferSize(),
-                                                 bitmap->GetImageWidth(),
-                                                 bitmap->GetImageHeight(),
-                                                 bitmap->GetPixelFormat() );
-
-          Dali::Devel::PixelBuffer pixelBuffer( pixelBufferImpl.Get() );
-          return pixelBuffer;
+          return bitmap;
         }
         else
         {