[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 ce1bba3..f9f1d35 100755 (executable)
--- a/dali/internal/imaging/common/loader-jpeg-turbo.cpp
+++ b/dali/internal/imaging/common/loader-jpeg-turbo.cpp
@@ -228,7 +228,7 @@ 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:
@@ -532,7 +532,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;
@@ -1118,7 +1118,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();