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-wbmp.cpp
diff --git
a/dali/internal/imaging/common/loader-wbmp.cpp
b/dali/internal/imaging/common/loader-wbmp.cpp
index
05d7aa0
..
6942442
100755
(executable)
--- a/
dali/internal/imaging/common/loader-wbmp.cpp
+++ b/
dali/internal/imaging/common/loader-wbmp.cpp
@@
-27,10
+27,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
{
@@
-112,12
+108,12
@@
bool LoadBitmapFromWbmp( const Dali::ImageLoader::Input& input, Dali::Devel::Pix
unsigned char *line = NULL;
unsigned int cur = 0, x, y;
unsigned char *line = NULL;
unsigned int cur = 0, x, y;
- if(
InternalFile::
fseek(fp,0,SEEK_END) )
+ if( fseek(fp,0,SEEK_END) )
{
DALI_LOG_ERROR("Error seeking WBMP data\n");
return false;
}
{
DALI_LOG_ERROR("Error seeking WBMP data\n");
return false;
}
- long positionIndicator =
InternalFile::
ftell(fp);
+ long positionIndicator = ftell(fp);
unsigned int fsize( 0u );
if( positionIndicator > -1L )
unsigned int fsize( 0u );
if( positionIndicator > -1L )
@@
-131,7
+127,7
@@
bool LoadBitmapFromWbmp( const Dali::ImageLoader::Input& input, Dali::Devel::Pix
return false;
}
return false;
}
- if(
InternalFile::
fseek(fp, 0, SEEK_SET) )
+ if( fseek(fp, 0, SEEK_SET) )
{
DALI_LOG_ERROR("Error seeking WBMP data\n");
return false;
{
DALI_LOG_ERROR("Error seeking WBMP data\n");
return false;
@@
-148,7
+144,7
@@
bool LoadBitmapFromWbmp( const Dali::ImageLoader::Input& input, Dali::Devel::Pix
}
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;
@@
-228,12
+224,12
@@
bool LoadWbmpHeader( const Dali::ImageLoader::Input& input, unsigned int& width,
unsigned int w, h;
unsigned int type;
unsigned int w, h;
unsigned int type;
- if(
InternalFile::
fseek(fp,0,SEEK_END) )
+ if( fseek(fp,0,SEEK_END) )
{
DALI_LOG_ERROR("Error seeking WBMP data\n");
return false;
}
{
DALI_LOG_ERROR("Error seeking WBMP data\n");
return false;
}
- long positionIndicator =
InternalFile::
ftell(fp);
+ long positionIndicator = ftell(fp);
unsigned int fsize( 0u );
if( positionIndicator > -1L )
unsigned int fsize( 0u );
if( positionIndicator > -1L )
@@
-246,7
+242,7
@@
bool LoadWbmpHeader( const Dali::ImageLoader::Input& input, unsigned int& width,
return false;
}
return false;
}
- if(
InternalFile::
fseek(fp, 0, SEEK_SET) )
+ if( fseek(fp, 0, SEEK_SET) )
{
DALI_LOG_ERROR("Error seeking WBMP data\n");
return false;
{
DALI_LOG_ERROR("Error seeking WBMP data\n");
return false;
@@
-262,7
+258,7
@@
bool LoadWbmpHeader( const Dali::ImageLoader::Input& input, unsigned int& width,
headerSize = std::min(headerSize, fsize);
map.Resize(headerSize);
headerSize = std::min(headerSize, fsize);
map.Resize(headerSize);
- if(
InternalFile::
fread(&map[0], 1, headerSize, fp) != headerSize)
+ if(fread(&map[0], 1, headerSize, fp) != headerSize)
{
DALI_LOG_WARNING("image file read opeation error!\n");
return false;
{
DALI_LOG_WARNING("image file read opeation error!\n");
return false;