Merge branch 'devel/master' into tizen

Change-Id: I8d72d2b8c5abf59c95e8da047d773eb4abedeba4

diff --cc platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp
index 5f130c7,455d1f7..5e1b711
--- 1/platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp
--- 2/platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp
+++ b/platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp
@@@ -334,19 -349,15 +349,15 @@@ bool LoadBitmapFromJpeg( const Resource
    {
      std::string errorString = tjGetErrorStr();
  
-     if( errorString.find("Corrupt JPEG data") == std::string::npos )
+     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());
      }
- 
-     //TurboJPEG API functions will now return an error code if a warning is triggered in the underlying libjpeg API.
-     //So, we need to distinguish return of tjGetErrorStr() is warning or error.
-     //If the return string has 'Corrupt JPEG data' prefix, it means warning.
    }
  
    const unsigned int  bufferWidth  = GetTextureDimension( scaledPreXformWidth );