X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fimaging%2Fcommon%2Floader-ico.cpp;h=acb74f42bc11863666b3d6d71e5198d6a13cd72c;hb=56fe2ff219abb4c0db738735d536c4dbe049bddd;hp=e8daa077b6bf5d8d491720b1effd748621a98ee2;hpb=2cae522c7cd202e13dd387e6b3b60d12570bc547;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 e8daa07..acb74f4 --- a/dali/internal/imaging/common/loader-ico.cpp +++ b/dali/internal/imaging/common/loader-ico.cpp @@ -58,6 +58,10 @@ #include #include +#include + +using namespace Dali::Internal::Platform; + namespace Dali { @@ -174,13 +178,13 @@ bool LoadIcoHeaderHelper( FILE* fp, unsigned short word; unsigned char byte; - if( fseek(fp,0,SEEK_END) ) + if( InternalFile::fseek(fp,0,SEEK_END) ) { DALI_LOG_ERROR("Error seeking ICO data\n"); return false; } - long positionIndicator = ftell(fp); + long positionIndicator = InternalFile::ftell(fp); fsize = 0u; if( positionIndicator > -1L ) @@ -193,7 +197,7 @@ bool LoadIcoHeaderHelper( FILE* fp, return false; } - if( fseek(fp, 0, SEEK_SET) ) + if( InternalFile::fseek(fp, 0, SEEK_SET) ) { DALI_LOG_ERROR("Error seeking ICO data\n"); return false; @@ -205,7 +209,7 @@ bool LoadIcoHeaderHelper( FILE* fp, } map.Resize(fsize); - if(fread(&map[0], 1, fsize, fp) != fsize) + if(InternalFile::fread(&map[0], 1, fsize, fp) != fsize) { DALI_LOG_WARNING("image file read opeation error!\n"); return false; @@ -337,7 +341,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; @@ -355,7 +359,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;