[3.0] Fix native image capture code and DALi image saving

[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 5ca55b7..f042ce7 100755 (executable)
--- a/platform-abstractions/tizen/image-loaders/loader-wbmp.cpp
+++ b/platform-abstractions/tizen/image-loaders/loader-wbmp.cpp
@@ -26,7 +26,6 @@
 // INTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/bitmap.h>
-#include <dali/public-api/images/image-attributes.h>
 #include <dali/public-api/common/dali-vector.h>
 
 namespace Dali
@@ -83,7 +82,7 @@ int extractMultiByteInteger(unsigned int *data, void *map, size_t length, size_t
 
     if ((buf & 0x80) == 0)
     {
-      DALI_LOG_INFO(gLogFilter, Debug::Verbose, "position: %d, readBufCount: %d", *position, readBufCount);
+      DALI_LOG_INFO(gLogFilter, Debug::Verbose, "position: %d, readBufCount: %d\n", *position, readBufCount);
       break;
     }
   }
@@ -93,9 +92,9 @@ int extractMultiByteInteger(unsigned int *data, void *map, size_t length, size_t
 
 }// end unnamed namespace
 
-bool LoadBitmapFromWbmp( FILE *fp, Integration::Bitmap& bitmap, ImageAttributes& attributes, const ResourceLoadingClient& client )
+bool LoadBitmapFromWbmp( const ResourceLoadingClient& client, const ImageLoader::Input& input, Integration::Bitmap& bitmap )
 {
-
+  FILE* const fp = input.file;
   if(fp == NULL)
   {
     DALI_LOG_ERROR("Error loading bitmap\n");
@@ -150,7 +149,7 @@ bool LoadBitmapFromWbmp( FILE *fp, Integration::Bitmap& bitmap, ImageAttributes&
 
   if(fread(&map[0], 1, fsize, fp) != fsize)
   {
-    DALI_LOG_WARNING("image file read opeation error!");
+    DALI_LOG_WARNING("image file read opeation error!\n");
     return false;
   }
 
@@ -210,14 +209,14 @@ bool LoadBitmapFromWbmp( FILE *fp, Integration::Bitmap& bitmap, ImageAttributes&
   pixels = bitmap.GetPackedPixelsProfile()->ReserveBuffer(Pixel::L8, w, h);//Pixel::RGBA8888
 
   memcpy(pixels, (unsigned char*)&surface[0], w * h );//w * h * 4
-  attributes.SetSize(w, h);
 
   return true;
 }
 
 
-bool LoadWbmpHeader(FILE *fp, const ImageAttributes& attributes, unsigned int &width, unsigned int &height )
+bool LoadWbmpHeader( const ImageLoader::Input& input, unsigned int& width, unsigned int& height )
 {
+  FILE* const fp = input.file;
   if(fp == NULL)
   {
     DALI_LOG_ERROR("Error loading bitmap\n");
@@ -264,13 +263,13 @@ bool LoadWbmpHeader(FILE *fp, const ImageAttributes& attributes, unsigned int &w
   map.Resize(headerSize);
   if(fread(&map[0], 1, headerSize, fp) != headerSize)
   {
-    DALI_LOG_WARNING("image file read opeation error!");
+    DALI_LOG_WARNING("image file read opeation error!\n");
     return false;
   }
 
-  if (extractMultiByteInteger(&type, &map[0], fsize, &position) < 0)
+  if (extractMultiByteInteger(&type, &map[0], headerSize, &position) < 0)
   {
-    DALI_LOG_ERROR("Error: unable to read type!");
+    DALI_LOG_ERROR("Error: unable to read type!\n");
     return false;
   }
   position++; /* skipping one byte */
@@ -279,12 +278,12 @@ bool LoadWbmpHeader(FILE *fp, const ImageAttributes& attributes, unsigned int &w
     DALI_LOG_ERROR("Error: unknown format!\n");
     return false;
   }
-  if (extractMultiByteInteger(&w, &map[0], fsize, &position) < 0)
+  if (extractMultiByteInteger(&w, &map[0], headerSize, &position) < 0)
   {
     DALI_LOG_ERROR("Error: can not read width!\n");
     return false;
   }
-  if (extractMultiByteInteger(&h, &map[0], fsize, &position) < 0)
+  if (extractMultiByteInteger(&h, &map[0], headerSize, &position) < 0)
   {
     DALI_LOG_ERROR("Error: can not read height!\n");
     return false;