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-png.cpp
diff --git
a/dali/internal/imaging/common/loader-png.cpp
b/dali/internal/imaging/common/loader-png.cpp
old mode 100644
(file)
new mode 100755
(executable)
index
315e7fe
..
4b51af3
--- a/
dali/internal/imaging/common/loader-png.cpp
+++ b/
dali/internal/imaging/common/loader-png.cpp
@@
-27,10
+27,6
@@
#include <dali/internal/legacy/tizen/platform-capabilities.h>
#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
#include <dali/internal/legacy/tizen/platform-capabilities.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 TizenPlatform
namespace Dali
{
namespace TizenPlatform
@@
-65,7
+61,7
@@
bool LoadPngHeader(FILE *fp, unsigned int &width, unsigned int &height, png_stru
png_byte header[8] = { 0 };
// Check header to see if it is a PNG file
png_byte header[8] = { 0 };
// Check header to see if it is a PNG file
- size_t size =
InternalFile::
fread(header, 1, 8, fp);
+ size_t size = fread(header, 1, 8, fp);
if(size != 8)
{
return false;
if(size != 8)
{
return false;
@@
-114,7
+110,7
@@
bool LoadPngHeader(FILE *fp, unsigned int &width, unsigned int &height, png_stru
} // namespace - anonymous
} // namespace - anonymous
-bool LoadPngHeader( const ImageLoader::Input& input, unsigned int& width, unsigned int& height )
+bool LoadPngHeader( const
Dali::
ImageLoader::Input& input, unsigned int& width, unsigned int& height )
{
png_structp png = NULL;
png_infop info = NULL;
{
png_structp png = NULL;
png_infop info = NULL;
@@
-125,7
+121,7
@@
bool LoadPngHeader( const ImageLoader::Input& input, unsigned int& width, unsign
return success;
}
return success;
}
-bool LoadBitmapFromPng( const ImageLoader::Input& input, Dali::Devel::PixelBuffer& bitmap )
+bool LoadBitmapFromPng( const
Dali::
ImageLoader::Input& input, Dali::Devel::PixelBuffer& bitmap )
{
png_structp png = NULL;
png_infop info = NULL;
{
png_structp png = NULL;
png_infop info = NULL;