projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[Tizen] Add codes for Dali Windows Backend"
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
imaging
/
common
/
loader-ktx.cpp
diff --git
a/dali/internal/imaging/common/loader-ktx.cpp
b/dali/internal/imaging/common/loader-ktx.cpp
index
0e0881b
..
e431239
100755
(executable)
--- a/
dali/internal/imaging/common/loader-ktx.cpp
+++ b/
dali/internal/imaging/common/loader-ktx.cpp
@@
-25,10
+25,6
@@
#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
#include <dali/internal/imaging/common/pixel-buffer-impl.h>
#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 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
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;
}
{
return false;
}
@@
-560,7
+556,7
@@
bool LoadBitmapFromKtx( const Dali::ImageLoader::Input& input, Dali::Devel::Pixe
// Skip the key-values:
const long int imageSizeOffset = sizeof(KtxFileHeader) + fileHeader.bytesOfKeyValueData;
// 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;
{
DALI_LOG_ERROR( "Seek past key/vals in KTX compressed bitmap file failed.\n" );
return false;
@@
-568,7
+564,7
@@
bool LoadBitmapFromKtx( const Dali::ImageLoader::Input& input, Dali::Devel::Pixe
// Load the size of the image data:
uint32_t imageByteCount = 0;
// 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;
{
DALI_LOG_ERROR( "Read of image size failed.\n" );
return false;
@@
-609,7
+605,7
@@
bool LoadBitmapFromKtx( const Dali::ImageLoader::Input& input, Dali::Devel::Pixe
return false;
}
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" );
if(bytesRead != imageByteCount)
{
DALI_LOG_ERROR( "Read of image pixel data failed.\n" );