X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=blobdiff_plain;f=dali%2Finternal%2Fimaging%2Fcommon%2Floader-ktx.cpp;h=abaad260acf8ba5628d80220118e462895a4d0e9;hp=963ef195f86289849cacf50a0e8613348edf96d8;hb=783e17c94e8adc4bd624031af599922c9eb1e0c6;hpb=14caebe2b88d7e2c97749c7389deac9ac560b8a6 diff --git a/dali/internal/imaging/common/loader-ktx.cpp b/dali/internal/imaging/common/loader-ktx.cpp old mode 100755 new mode 100644 index 963ef19..abaad26 --- a/dali/internal/imaging/common/loader-ktx.cpp +++ b/dali/internal/imaging/common/loader-ktx.cpp @@ -25,10 +25,6 @@ #include #include -#include - -using namespace Dali::Internal::Platform; - namespace Dali { @@ -198,7 +194,7 @@ inline bool ReadHeader( FILE* filePointer, KtxFileHeader& header ) const unsigned int readLength = sizeof( KtxFileHeader ); // Load the information directly into our structure - if( InternalFile::fread( &header, 1, readLength, filePointer ) != readLength ) + if( fread( &header, 1, readLength, filePointer ) != readLength ) { return false; } @@ -560,7 +556,7 @@ bool LoadBitmapFromKtx( const ImageLoader::Input& input, Dali::Devel::PixelBuffe // Skip the key-values: const long int imageSizeOffset = sizeof(KtxFileHeader) + fileHeader.bytesOfKeyValueData; - if(InternalFile::fseek(fp, imageSizeOffset, SEEK_SET)) + if(fseek(fp, imageSizeOffset, SEEK_SET)) { DALI_LOG_ERROR( "Seek past key/vals in KTX compressed bitmap file failed.\n" ); return false; @@ -568,7 +564,7 @@ bool LoadBitmapFromKtx( const ImageLoader::Input& input, Dali::Devel::PixelBuffe // Load the size of the image data: uint32_t imageByteCount = 0; - if ( InternalFile::fread( &imageByteCount, 1, 4, fp ) != 4 ) + if ( fread( &imageByteCount, 1, 4, fp ) != 4 ) { DALI_LOG_ERROR( "Read of image size failed.\n" ); return false; @@ -609,7 +605,7 @@ bool LoadBitmapFromKtx( const ImageLoader::Input& input, Dali::Devel::PixelBuffe return false; } - const size_t bytesRead = InternalFile::fread(pixels, 1, imageByteCount, fp); + const size_t bytesRead = fread(pixels, 1, imageByteCount, fp); if(bytesRead != imageByteCount) { DALI_LOG_ERROR( "Read of image pixel data failed.\n" );