X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fimaging%2Fcommon%2Floader-ico.cpp;h=dc99750b3607d20f23e1ea509e0c54f90116f8bc;hb=0e16b26dbe317545978954a6269a8139dcf8a0b6;hp=bd65cd59f7aecaed3e054674cb33daed9759abec;hpb=90da392b4640c1f188aba0ec8f9a9fc0d6eedaa8;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/imaging/common/loader-ico.cpp b/dali/internal/imaging/common/loader-ico.cpp old mode 100644 new mode 100755 index bd65cd5..dc99750 --- a/dali/internal/imaging/common/loader-ico.cpp +++ b/dali/internal/imaging/common/loader-ico.cpp @@ -58,10 +58,6 @@ #include #include -#include - -using namespace Dali::Internal::Platform; - namespace Dali { @@ -178,13 +174,13 @@ bool LoadIcoHeaderHelper( FILE* fp, unsigned short word; unsigned char byte; - if( InternalFile::fseek(fp,0,SEEK_END) ) + if( fseek(fp,0,SEEK_END) ) { DALI_LOG_ERROR("Error seeking ICO data\n"); return false; } - long positionIndicator = InternalFile::ftell(fp); + long positionIndicator = ftell(fp); fsize = 0u; if( positionIndicator > -1L ) @@ -197,7 +193,7 @@ bool LoadIcoHeaderHelper( FILE* fp, return false; } - if( InternalFile::fseek(fp, 0, SEEK_SET) ) + if( fseek(fp, 0, SEEK_SET) ) { DALI_LOG_ERROR("Error seeking ICO data\n"); return false; @@ -209,7 +205,7 @@ bool LoadIcoHeaderHelper( FILE* fp, } 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; @@ -341,7 +337,7 @@ bool LoadIcoHeaderHelper( FILE* fp, }//unnamed namespace -bool LoadIcoHeader( const ImageLoader::Input& input, unsigned int& width, unsigned int& height ) +bool LoadIcoHeader( const Dali::ImageLoader::Input& input, unsigned int& width, unsigned int& height ) { IcoData chosen; Dali::Vector map; @@ -359,7 +355,7 @@ bool LoadIcoHeader( const ImageLoader::Input& input, unsigned int& width, unsign return true; } -bool LoadBitmapFromIco( const ImageLoader::Input& input, Dali::Devel::PixelBuffer& bitmap ) +bool LoadBitmapFromIco( const Dali::ImageLoader::Input& input, Dali::Devel::PixelBuffer& bitmap ) { IcoData chosen; Dali::Vector map;