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
/
image-loader.cpp
diff --git
a/dali/internal/imaging/common/image-loader.cpp
b/dali/internal/imaging/common/image-loader.cpp
index
e8b3b79
..
b83878e
100755
(executable)
--- a/
dali/internal/imaging/common/image-loader.cpp
+++ b/
dali/internal/imaging/common/image-loader.cpp
@@
-33,7
+33,6
@@
#include <dali/internal/system/common/file-reader.h>
using namespace Dali::Integration;
#include <dali/internal/system/common/file-reader.h>
using namespace Dali::Integration;
-using namespace Dali::Internal::Platform;
namespace Dali
{
namespace Dali
{
@@
-148,10
+147,10
@@
bool GetBitmapLoaderFunctions( FILE *fp,
const std::string& filename )
{
unsigned char magic[MAGIC_LENGTH];
const std::string& filename )
{
unsigned char magic[MAGIC_LENGTH];
- size_t read =
InternalFile::
fread(magic, sizeof(unsigned char), MAGIC_LENGTH, fp);
+ size_t read = fread(magic, sizeof(unsigned char), MAGIC_LENGTH, fp);
// Reset to the start of the file.
// Reset to the start of the file.
- if(
InternalFile::
fseek(fp, 0, SEEK_SET) )
+ if( fseek(fp, 0, SEEK_SET) )
{
DALI_LOG_ERROR("Error seeking to start of file\n");
}
{
DALI_LOG_ERROR("Error seeking to start of file\n");
}
@@
-236,7
+235,7
@@
bool GetBitmapLoaderFunctions( FILE *fp,
}
// Reset to the start of the file.
}
// Reset to the start of the file.
- if(
InternalFile::
fseek(fp, 0, SEEK_SET) )
+ if( fseek(fp, 0, SEEK_SET) )
{
DALI_LOG_ERROR("Error seeking to start of file\n");
}
{
DALI_LOG_ERROR("Error seeking to start of file\n");
}