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-jpeg-turbo.cpp
diff --git
a/dali/internal/imaging/common/loader-jpeg-turbo.cpp
b/dali/internal/imaging/common/loader-jpeg-turbo.cpp
index
f9f1d35
..
b507693
100755
(executable)
--- a/
dali/internal/imaging/common/loader-jpeg-turbo.cpp
+++ b/
dali/internal/imaging/common/loader-jpeg-turbo.cpp
@@
-42,10
+42,6
@@
#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;
@@
-233,7
+229,7
@@
void AddExifFieldPropertyMap( Dali::Property::Map& out, const ExifEntry& entry,
}
case EXIF_FORMAT_SHORT:
{
}
case EXIF_FORMAT_SHORT:
{
- out.Insert( shortName, ConvertExifNumeric<int, unsigned
in
t>(entry) );
+ out.Insert( shortName, ConvertExifNumeric<int, unsigned
shor
t>(entry) );
break;
}
case EXIF_FORMAT_LONG:
break;
}
case EXIF_FORMAT_LONG:
@@
-243,7
+239,7
@@
void AddExifFieldPropertyMap( Dali::Property::Map& out, const ExifEntry& entry,
}
case EXIF_FORMAT_SSHORT:
{
}
case EXIF_FORMAT_SSHORT:
{
- out.Insert( shortName, ConvertExifNumeric<int,
in
t>(entry) );
+ out.Insert( shortName, ConvertExifNumeric<int,
shor
t>(entry) );
break;
}
case EXIF_FORMAT_SLONG:
break;
}
case EXIF_FORMAT_SLONG:
@@
-537,13
+533,13
@@
bool LoadBitmapFromJpeg( const Dali::ImageLoader::Input& input, Dali::Devel::Pix
const int flags= 0;
FILE* const fp = input.file;
const int flags= 0;
FILE* const fp = input.file;
- if(
InternalFile::
fseek(fp,0,SEEK_END) )
+ if( 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 =
InternalFile::
ftell(fp);
+ long positionIndicator = ftell(fp);
unsigned int jpegBufferSize = 0u;
if( positionIndicator > -1L )
{
unsigned int jpegBufferSize = 0u;
if( positionIndicator > -1L )
{
@@
-555,7
+551,7
@@
bool LoadBitmapFromJpeg( 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 to start of file\n");
return false;
{
DALI_LOG_ERROR("Error seeking to start of file\n");
return false;
@@
-574,13
+570,13
@@
bool LoadBitmapFromJpeg( const Dali::ImageLoader::Input& input, Dali::Devel::Pix
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(
InternalFile::
fread( jpegBufferPtr, 1, jpegBufferSize, fp ) != jpegBufferSize )
+ if( 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(
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");
}
@@
-1090,7
+1086,7
@@
ExifHandle LoadExifData( FILE* fp )
auto exifData = MakeNullExifData();
unsigned char dataBuffer[1024];
auto exifData = MakeNullExifData();
unsigned char dataBuffer[1024];
- 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");
}
@@
-1099,9
+1095,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( !
InternalFile::
feof(fp) )
+ while( !feof(fp) )
{
{
- int size =
InternalFile::
fread( dataBuffer, 1, sizeof( dataBuffer ), fp );
+ int size = fread( dataBuffer, 1, sizeof( dataBuffer ), fp );
if( size <= 0 )
{
break;
if( size <= 0 )
{
break;