Change data type for 64bits machine

[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 1fab9a2..1848a1c 100755 (executable)
--- a/dali/internal/imaging/common/loader-jpeg-turbo.cpp
+++ b/dali/internal/imaging/common/loader-jpeg-turbo.cpp
@@ -229,22 +229,22 @@ void AddExifFieldPropertyMap( Dali::Property::Map& out, const ExifEntry& entry,
     }
     case EXIF_FORMAT_SHORT:
     {
-      out.Insert( shortName, ConvertExifNumeric<int, unsigned int>(entry) );
+      out.Insert( shortName, ConvertExifNumeric<int, uint16_t>(entry) );
       break;
     }
     case EXIF_FORMAT_LONG:
     {
-      out.Insert( shortName, ConvertExifNumeric<int, unsigned long>(entry) );
+      out.Insert( shortName, ConvertExifNumeric<int, uint32_t>(entry) );
       break;
     }
     case EXIF_FORMAT_SSHORT:
     {
-      out.Insert( shortName, ConvertExifNumeric<int, int>(entry) );
+      out.Insert( shortName, ConvertExifNumeric<int, int16_t>(entry) );
       break;
     }
     case EXIF_FORMAT_SLONG:
     {
-      out.Insert( shortName, ConvertExifNumeric<int, long>(entry) );
+      out.Insert( shortName, ConvertExifNumeric<int, int32_t>(entry) );
       break;
     }
     case EXIF_FORMAT_FLOAT:
@@ -872,7 +872,7 @@ bool EncodeToJpeg( const unsigned char* const pixelBuffer, Vector< unsigned char
   // Initialise a JPEG codec:
   {
     auto jpeg = MakeJpegCompressor();
-    if( jpeg )
+    if( !jpeg )
     {
       DALI_LOG_ERROR( "JPEG Compressor init failed: %s\n", tjGetErrorStr() );
       return false;