X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fimaging%2Fcommon%2Floader-jpeg-turbo.cpp;h=87673a72384f297b84cf395a05e44efcda02e6e6;hb=ff8e2614c73c417c4cd9b20c071a4644a095f563;hp=f9f1d3589a420c22e50b3deef5ecb439d653d9c5;hpb=517bac1c97d64beca476f1e3736f792b22b8f184;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/internal/imaging/common/loader-jpeg-turbo.cpp b/dali/internal/imaging/common/loader-jpeg-turbo.cpp
index f9f1d35..87673a7 100755
--- a/dali/internal/imaging/common/loader-jpeg-turbo.cpp
+++ b/dali/internal/imaging/common/loader-jpeg-turbo.cpp
@@ -233,7 +233,7 @@ 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, unsigned short>(entry) );
       break;
     }
     case EXIF_FORMAT_LONG:
@@ -243,7 +243,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:
@@ -876,7 +876,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;