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
[Tizen] Add codes for Dali Windows Backend
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
imaging
/
common
/
loader-jpeg-turbo.cpp
diff --git
a/dali/internal/imaging/common/loader-jpeg-turbo.cpp
b/dali/internal/imaging/common/loader-jpeg-turbo.cpp
old mode 100644
(file)
new mode 100755
(executable)
index
4efc020
..
ce1bba3
--- a/
dali/internal/imaging/common/loader-jpeg-turbo.cpp
+++ b/
dali/internal/imaging/common/loader-jpeg-turbo.cpp
@@
-42,6
+42,10
@@
#include <dali/devel-api/adaptor-framework/image-loading.h>
#include <dali/internal/imaging/common/pixel-buffer-impl.h>
#include <dali/devel-api/adaptor-framework/image-loading.h>
#include <dali/internal/imaging/common/pixel-buffer-impl.h>
+#include <dali/internal/system/common/file-closer.h>
+
+using namespace Dali::Internal::Platform;
+
namespace
{
using Dali::Vector;
namespace
{
using Dali::Vector;
@@
-533,13
+537,13
@@
bool LoadBitmapFromJpeg( const ImageLoader::Input& input, Dali::Devel::PixelBuff
const int flags= 0;
FILE* const fp = input.file;
const int flags= 0;
FILE* const fp = input.file;
- if( fseek(fp,0,SEEK_END) )
+ if(
InternalFile::
fseek(fp,0,SEEK_END) )
{
DALI_LOG_ERROR("Error seeking to end of file\n");
return false;
}
{
DALI_LOG_ERROR("Error seeking to end of file\n");
return false;
}
- long positionIndicator = ftell(fp);
+ long positionIndicator =
InternalFile::
ftell(fp);
unsigned int jpegBufferSize = 0u;
if( positionIndicator > -1L )
{
unsigned int jpegBufferSize = 0u;
if( positionIndicator > -1L )
{
@@
-551,7
+555,7
@@
bool LoadBitmapFromJpeg( const ImageLoader::Input& input, Dali::Devel::PixelBuff
return false;
}
return false;
}
- if( fseek(fp, 0, SEEK_SET) )
+ if(
InternalFile::
fseek(fp, 0, SEEK_SET) )
{
DALI_LOG_ERROR("Error seeking to start of file\n");
return false;
{
DALI_LOG_ERROR("Error seeking to start of file\n");
return false;
@@
-570,13
+574,13
@@
bool LoadBitmapFromJpeg( const ImageLoader::Input& input, Dali::Devel::PixelBuff
unsigned char * const jpegBufferPtr = jpegBuffer.Begin();
// Pull the compressed JPEG image bytes out of a file and into memory:
unsigned char * const jpegBufferPtr = jpegBuffer.Begin();
// Pull the compressed JPEG image bytes out of a file and into memory:
- if( fread( jpegBufferPtr, 1, jpegBufferSize, fp ) != jpegBufferSize )
+ if(
InternalFile::
fread( jpegBufferPtr, 1, jpegBufferSize, fp ) != jpegBufferSize )
{
DALI_LOG_WARNING("Error on image file read.\n");
return false;
}
{
DALI_LOG_WARNING("Error on image file read.\n");
return false;
}
- if( fseek(fp, 0, SEEK_SET) )
+ if(
InternalFile::
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");
}
@@
-1086,7
+1090,7
@@
ExifHandle LoadExifData( FILE* fp )
auto exifData = MakeNullExifData();
unsigned char dataBuffer[1024];
auto exifData = MakeNullExifData();
unsigned char dataBuffer[1024];
- if( fseek( fp, 0, SEEK_SET ) )
+ if(
InternalFile::
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");
}
@@
-1095,9
+1099,9
@@
ExifHandle LoadExifData( FILE* fp )
auto exifLoader = std::unique_ptr<ExifLoader, decltype(exif_loader_unref)*>{
exif_loader_new(), exif_loader_unref };
auto exifLoader = std::unique_ptr<ExifLoader, decltype(exif_loader_unref)*>{
exif_loader_new(), exif_loader_unref };
- while( !feof(fp) )
+ while( !
InternalFile::
feof(fp) )
{
{
- int size = fread( dataBuffer, 1, sizeof( dataBuffer ), fp );
+ int size =
InternalFile::
fread( dataBuffer, 1, sizeof( dataBuffer ), fp );
if( size <= 0 )
{
break;
if( size <= 0 )
{
break;