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
old mode 100644 (file)
new mode 100755 (executable)
index 4efc020..b507693
--- a/dali/internal/imaging/common/loader-jpeg-turbo.cpp
+++ b/dali/internal/imaging/common/loader-jpeg-turbo.cpp
@@ -224,12 +224,12 @@ void AddExifFieldPropertyMap( Dali::Property::Map& out, const ExifEntry& entry,
   {
     case EXIF_FORMAT_ASCII:
     {
-      out.Insert( shortName, std::string(reinterpret_cast<char *>(entry.data)) );
+      out.Insert( shortName, std::string( reinterpret_cast<char *>(entry.data), entry.size ) );
       break;
     }
     case EXIF_FORMAT_SHORT:
     {
-      out.Insert( shortName, ConvertExifNumeric<int, unsigned int>(entry) );
+      out.Insert( shortName, ConvertExifNumeric<int, unsigned short>(entry) );
       break;
     }
     case EXIF_FORMAT_LONG:
@@ -239,7 +239,7 @@ void AddExifFieldPropertyMap( Dali::Property::Map& out, const ExifEntry& entry,
     }
     case EXIF_FORMAT_SSHORT:
     {
-      out.Insert( shortName, ConvertExifNumeric<int, int>(entry) );
+      out.Insert( shortName, ConvertExifNumeric<int, short>(entry) );
       break;
     }
     case EXIF_FORMAT_SLONG:
@@ -528,7 +528,7 @@ bool LoadJpegHeader( FILE *fp, unsigned int &width, unsigned int &height )
   return true;
 }
 
-bool LoadBitmapFromJpeg( const ImageLoader::Input& input, Dali::Devel::PixelBuffer& bitmap )
+bool LoadBitmapFromJpeg( const Dali::ImageLoader::Input& input, Dali::Devel::PixelBuffer& bitmap )
 {
   const int flags= 0;
   FILE* const fp = input.file;
@@ -1114,7 +1114,7 @@ ExifHandle LoadExifData( FILE* fp )
   return exifData;
 }
 
-bool LoadJpegHeader( const ImageLoader::Input& input, unsigned int& width, unsigned int& height )
+bool LoadJpegHeader( const Dali::ImageLoader::Input& input, unsigned int& width, unsigned int& height )
 {
   unsigned int requiredWidth  = input.scalingParameters.dimensions.GetWidth();
   unsigned int requiredHeight = input.scalingParameters.dimensions.GetHeight();