X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fimaging%2Fcommon%2Floader-astc.cpp;h=4765bf9458de1544629206c4024805cb2046b097;hb=0e16b26dbe317545978954a6269a8139dcf8a0b6;hp=2dd25cd27a1e98aed49bf6362c015e31c019a7ee;hpb=b98efd1ab3a6e92b19be748d39511b45a825f466;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/internal/imaging/common/loader-astc.cpp b/dali/internal/imaging/common/loader-astc.cpp
index 2dd25cd..4765bf9 100755
--- a/dali/internal/imaging/common/loader-astc.cpp
+++ b/dali/internal/imaging/common/loader-astc.cpp
@@ -26,10 +26,6 @@
 #include <dali/devel-api/adaptor-framework/pixel-buffer.h>
 #include <dali/internal/imaging/common/pixel-buffer-impl.h>
 
-#include <dali/internal/system/common/file-closer.h>
-
-using namespace Dali::Internal::Platform;
-
 namespace Dali
 {
 namespace TizenPlatform
@@ -124,7 +120,7 @@ bool LoadAstcHeader( FILE * const filePointer, unsigned int& width, unsigned int
 {
   // Pull the bytes of the file header in as a block:
   const unsigned int readLength = sizeof( AstcFileHeader );
-  if( InternalFile::fread( &fileHeader, 1, readLength, filePointer ) != readLength )
+  if( fread( &fileHeader, 1, readLength, filePointer ) != readLength )
   {
     return false;
   }
@@ -165,14 +161,14 @@ bool LoadAstcHeader( FILE * const filePointer, unsigned int& width, unsigned int
 
 
 // File loading API entry-point:
-bool LoadAstcHeader( const ImageLoader::Input& input, unsigned int& width, unsigned int& height )
+bool LoadAstcHeader( const Dali::ImageLoader::Input& input, unsigned int& width, unsigned int& height )
 {
   AstcFileHeader fileHeader;
   return LoadAstcHeader( input.file, width, height, fileHeader );
 }
 
 // File loading API entry-point:
-bool LoadBitmapFromAstc( const ImageLoader::Input& input, Dali::Devel::PixelBuffer& bitmap )
+bool LoadBitmapFromAstc( const Dali::ImageLoader::Input& input, Dali::Devel::PixelBuffer& bitmap )
 {
   FILE* const filePointer = input.file;
   if( !filePointer )
@@ -200,20 +196,20 @@ bool LoadBitmapFromAstc( const ImageLoader::Input& input, Dali::Devel::PixelBuff
   }
 
   // Retrieve the file size.
-  if( InternalFile::fseek( filePointer, 0L, SEEK_END ) )
+  if( fseek( filePointer, 0L, SEEK_END ) )
   {
     DALI_LOG_ERROR( "Could not seek through file.\n" );
     return false;
   }
 
-  off_t fileSize = InternalFile::ftell( filePointer );
+  off_t fileSize = ftell( filePointer );
   if( fileSize == -1L )
   {
     DALI_LOG_ERROR( "Could not determine ASTC file size.\n" );
     return false;
   }
 
-  if( InternalFile::fseek( filePointer, sizeof( AstcFileHeader ), SEEK_SET ) )
+  if( fseek( filePointer, sizeof( AstcFileHeader ), SEEK_SET ) )
   {
     DALI_LOG_ERROR( "Could not seek through file.\n" );
     return false;
@@ -243,7 +239,7 @@ bool LoadBitmapFromAstc( const ImageLoader::Input& input, Dali::Devel::PixelBuff
   }
 
   // Load the image data.
-  const size_t bytesRead = InternalFile::fread( pixels, 1, imageByteCount, filePointer );
+  const size_t bytesRead = fread( pixels, 1, imageByteCount, filePointer );
 
   // Check the size of loaded data is what we expected.
   if( bytesRead != imageByteCount )