Merge branch 'devel/master' (1.1.28) into tizen

Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: Ie18065d9b7407c38253acef9d5616144cb774b05

diff --cc platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp
index 7e81375,33826b8..6613fff
--- 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,18 -334,19 +334,19 @@@ bool LoadBitmapFromJpeg( const Resource
    {
      std::string errorString = tjGetErrorStr();
  
-     //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.
      if( errorString.find("Corrupt JPEG data") == std::string::npos )
      {
 -        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 );