X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=blobdiff_plain;f=dali%2Finternal%2Fimaging%2Fcommon%2Floader-jpeg-turbo.cpp;h=1fab9a2bfa9e80fe5f8135d3929954e89561a13d;hp=f9f1d3589a420c22e50b3deef5ecb439d653d9c5;hb=de358850df203047408247a94b682597b018ec52;hpb=84e95268a60ab6e5fef013f3728b33b558c325e3 diff --git a/dali/internal/imaging/common/loader-jpeg-turbo.cpp b/dali/internal/imaging/common/loader-jpeg-turbo.cpp index f9f1d35..1fab9a2 100755 --- a/dali/internal/imaging/common/loader-jpeg-turbo.cpp +++ b/dali/internal/imaging/common/loader-jpeg-turbo.cpp @@ -42,10 +42,6 @@ #include #include -#include - -using namespace Dali::Internal::Platform; - namespace { using Dali::Vector; @@ -537,13 +533,13 @@ bool LoadBitmapFromJpeg( const Dali::ImageLoader::Input& input, Dali::Devel::Pix const int flags= 0; FILE* const fp = input.file; - if( InternalFile::fseek(fp,0,SEEK_END) ) + if( fseek(fp,0,SEEK_END) ) { DALI_LOG_ERROR("Error seeking to end of file\n"); return false; } - long positionIndicator = InternalFile::ftell(fp); + long positionIndicator = ftell(fp); unsigned int jpegBufferSize = 0u; if( positionIndicator > -1L ) { @@ -555,7 +551,7 @@ bool LoadBitmapFromJpeg( const Dali::ImageLoader::Input& input, Dali::Devel::Pix return false; } - if( InternalFile::fseek(fp, 0, SEEK_SET) ) + if( fseek(fp, 0, SEEK_SET) ) { DALI_LOG_ERROR("Error seeking to start of file\n"); return false; @@ -574,13 +570,13 @@ bool LoadBitmapFromJpeg( const Dali::ImageLoader::Input& input, Dali::Devel::Pix unsigned char * const jpegBufferPtr = jpegBuffer.Begin(); // Pull the compressed JPEG image bytes out of a file and into memory: - if( InternalFile::fread( jpegBufferPtr, 1, jpegBufferSize, fp ) != jpegBufferSize ) + if( fread( jpegBufferPtr, 1, jpegBufferSize, fp ) != jpegBufferSize ) { DALI_LOG_WARNING("Error on image file read.\n"); return false; } - if( InternalFile::fseek(fp, 0, SEEK_SET) ) + if( fseek(fp, 0, SEEK_SET) ) { DALI_LOG_ERROR("Error seeking to start of file\n"); } @@ -1090,7 +1086,7 @@ ExifHandle LoadExifData( FILE* fp ) auto exifData = MakeNullExifData(); unsigned char dataBuffer[1024]; - if( InternalFile::fseek( fp, 0, SEEK_SET ) ) + if( fseek( fp, 0, SEEK_SET ) ) { DALI_LOG_ERROR("Error seeking to start of file\n"); } @@ -1099,9 +1095,9 @@ ExifHandle LoadExifData( FILE* fp ) auto exifLoader = std::unique_ptr{ exif_loader_new(), exif_loader_unref }; - while( !InternalFile::feof(fp) ) + while( !feof(fp) ) { - int size = InternalFile::fread( dataBuffer, 1, sizeof( dataBuffer ), fp ); + int size = fread( dataBuffer, 1, sizeof( dataBuffer ), fp ); if( size <= 0 ) { break;