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-ico.cpp
diff --git
a/dali/internal/imaging/common/loader-ico.cpp
b/dali/internal/imaging/common/loader-ico.cpp
index
bd65cd5
..
dc99750
100755
(executable)
--- a/
dali/internal/imaging/common/loader-ico.cpp
+++ b/
dali/internal/imaging/common/loader-ico.cpp
@@
-58,10
+58,6
@@
#include <dali/integration-api/debug.h>
#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
#include <dali/integration-api/debug.h>
#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
-#include <dali/internal/system/common/file-closer.h>
-
-using namespace Dali::Internal::Platform;
-
namespace Dali
{
namespace Dali
{
@@
-178,13
+174,13
@@
bool LoadIcoHeaderHelper( FILE* fp,
unsigned short word;
unsigned char byte;
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;
}
{
DALI_LOG_ERROR("Error seeking ICO data\n");
return false;
}
- long positionIndicator =
InternalFile::
ftell(fp);
+ long positionIndicator = ftell(fp);
fsize = 0u;
if( positionIndicator > -1L )
fsize = 0u;
if( positionIndicator > -1L )
@@
-197,7
+193,7
@@
bool LoadIcoHeaderHelper( FILE* fp,
return false;
}
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;
{
DALI_LOG_ERROR("Error seeking ICO data\n");
return false;
@@
-209,7
+205,7
@@
bool LoadIcoHeaderHelper( FILE* fp,
}
map.Resize(fsize);
}
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;
{
DALI_LOG_WARNING("image file read opeation error!\n");
return false;
@@
-341,7
+337,7
@@
bool LoadIcoHeaderHelper( FILE* fp,
}//unnamed namespace
}//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<unsigned char> map;
{
IcoData chosen;
Dali::Vector<unsigned char> map;
@@
-359,7
+355,7
@@
bool LoadIcoHeader( const ImageLoader::Input& input, unsigned int& width, unsign
return true;
}
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<unsigned char> map;
{
IcoData chosen;
Dali::Vector<unsigned char> map;