X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fimaging%2Fcommon%2Floader-wbmp.cpp;h=6942442dc999ecfeeefc59ded663a4d1dae39e53;hb=0e16b26dbe317545978954a6269a8139dcf8a0b6;hp=264c4675a61f04d9d05590f006d04bd8b38da0a5;hpb=4b32c2ff33adaa23f8ae600380d7d7c246c1a9ad;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/internal/imaging/common/loader-wbmp.cpp b/dali/internal/imaging/common/loader-wbmp.cpp
index 264c467..6942442 100755
--- a/dali/internal/imaging/common/loader-wbmp.cpp
+++ b/dali/internal/imaging/common/loader-wbmp.cpp
@@ -27,10 +27,6 @@
 #include <dali/integration-api/debug.h>
 #include <dali/devel-api/adaptor-framework/pixel-buffer.h>
 
-#include <dali/internal/system/common/file-closer.h>
-
-using namespace Dali::Internal::Platform;
-
 namespace Dali
 {
 
@@ -94,7 +90,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 Dali::ImageLoader::Input& input, Dali::Devel::PixelBuffer& bitmap )
 {
   FILE* const fp = input.file;
   if(fp == NULL)
@@ -112,12 +108,12 @@ bool LoadBitmapFromWbmp( const ImageLoader::Input& input, Dali::Devel::PixelBuff
   unsigned char *line = NULL;
   unsigned int cur = 0, x, y;
 
-  if( InternalFile::fseek(fp,0,SEEK_END) )
+  if( fseek(fp,0,SEEK_END) )
   {
     DALI_LOG_ERROR("Error seeking WBMP data\n");
     return false;
   }
-  long positionIndicator = InternalFile::ftell(fp);
+  long positionIndicator = ftell(fp);
 
   unsigned int fsize( 0u );
   if( positionIndicator > -1L )
@@ -131,7 +127,7 @@ bool LoadBitmapFromWbmp( const ImageLoader::Input& input, Dali::Devel::PixelBuff
     return false;
   }
 
-  if( InternalFile::fseek(fp, 0, SEEK_SET) )
+  if( fseek(fp, 0, SEEK_SET) )
   {
     DALI_LOG_ERROR("Error seeking WBMP data\n");
     return false;
@@ -148,7 +144,7 @@ bool LoadBitmapFromWbmp( const ImageLoader::Input& input, Dali::Devel::PixelBuff
   }
   map.Resize(fsize);
 
-  if( InternalFile::fread(&map[0], 1, fsize, fp) != fsize)
+  if(fread(&map[0], 1, fsize, fp) != fsize)
   {
     DALI_LOG_WARNING("image file read opeation error!\n");
     return false;
@@ -215,7 +211,7 @@ bool LoadBitmapFromWbmp( const ImageLoader::Input& input, Dali::Devel::PixelBuff
 }
 
 
-bool LoadWbmpHeader( const ImageLoader::Input& input, unsigned int& width, unsigned int& height )
+bool LoadWbmpHeader( const Dali::ImageLoader::Input& input, unsigned int& width, unsigned int& height )
 {
   FILE* const fp = input.file;
   if(fp == NULL)
@@ -228,12 +224,12 @@ bool LoadWbmpHeader( const ImageLoader::Input& input, unsigned int& width, unsig
 
   unsigned int  w, h;
   unsigned int type;
-  if( InternalFile::fseek(fp,0,SEEK_END) )
+  if( fseek(fp,0,SEEK_END) )
   {
     DALI_LOG_ERROR("Error seeking WBMP data\n");
     return false;
   }
-  long positionIndicator = InternalFile::ftell(fp);
+  long positionIndicator = ftell(fp);
 
   unsigned int fsize( 0u );
   if( positionIndicator > -1L )
@@ -246,7 +242,7 @@ bool LoadWbmpHeader( const ImageLoader::Input& input, unsigned int& width, unsig
     return false;
   }
 
-  if( InternalFile::fseek(fp, 0, SEEK_SET) )
+  if( fseek(fp, 0, SEEK_SET) )
   {
     DALI_LOG_ERROR("Error seeking WBMP data\n");
     return false;
@@ -262,7 +258,7 @@ bool LoadWbmpHeader( const ImageLoader::Input& input, unsigned int& width, unsig
   headerSize = std::min(headerSize, fsize);
 
   map.Resize(headerSize);
-  if( InternalFile::fread(&map[0], 1, headerSize, fp) != headerSize)
+  if(fread(&map[0], 1, headerSize, fp) != headerSize)
   {
     DALI_LOG_WARNING("image file read opeation error!\n");
     return false;