Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-adaptor.git] / platform-abstractions / tizen / image-loaders / loader-jpeg-turbo.cpp

diff --git a/platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp b/platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp
index 6066192..f8de83c 100755 (executable)
--- a/platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp
+++ b/platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp
@@ -205,7 +205,11 @@ bool LoadJpegHeader( FILE *fp, unsigned int &width, unsigned int &height )
     return false;
   }
 
+// jpeg_create_decompress internally uses C casts
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
   jpeg_create_decompress( &cinfo );
+#pragma GCC diagnostic pop
 
   jpeg_stdio_src( &cinfo, fp );
 
@@ -343,12 +347,12 @@ bool LoadBitmapFromJpeg( const ImageLoader::Input& input, Integration::Bitmap& b
 
     if( IsJpegErrorFatal( errorString ) )
     {
-        DALI_LOG_ERROR("%s\n", errorString.c_str());
-        return false;
+      DALI_LOG_ERROR("%s\n", errorString.c_str());
+      return false;
     }
     else
     {
-        DALI_LOG_WARNING("%s\n", errorString.c_str());
+      DALI_LOG_WARNING("%s\n", errorString.c_str());
     }
   }