Change decoding error log level

Change-Id: I3c14defc1ffa6e28107519f3646f0d0288dd65f8

diff --git a/dali/internal/imaging/common/image-loader.cpp b/dali/internal/imaging/common/image-loader.cpp
index 8160468..f0ace20 100644 (file)
--- a/dali/internal/imaging/common/image-loader.cpp
+++ b/dali/internal/imaging/common/image-loader.cpp
@@ -280,7 +280,7 @@ bool ConvertStreamToBitmap(const BitmapResourceType& resource, std::string path,
 
       if(!result)
       {
-        DALI_LOG_WARNING("Unable to convert %s\n", path.c_str());
+        DALI_LOG_ERROR("Unable to convert %s\n", path.c_str());
         pixelBuffer.Reset();
       }
 
@@ -288,7 +288,7 @@ bool ConvertStreamToBitmap(const BitmapResourceType& resource, std::string path,
     }
     else
     {
-      DALI_LOG_WARNING("Image Decoder for %s unavailable\n", path.c_str());
+      DALI_LOG_ERROR("Image Decoder for %s unavailable\n", path.c_str());
     }
   }
 
@@ -360,12 +360,12 @@ ImageDimensions GetClosestImageSize(const std::string& filename,
       const bool read_res = headerFunction(input, width, height);
       if(!read_res)
       {
-        DALI_LOG_WARNING("Image Decoder failed to read header for %s\n", filename.c_str());
+        DALI_LOG_ERROR("Image Decoder failed to read header for %s\n", filename.c_str());
       }
     }
     else
     {
-      DALI_LOG_WARNING("Image Decoder for %s unavailable\n", filename.c_str());
+      DALI_LOG_ERROR("Image Decoder for %s unavailable\n", filename.c_str());
     }
   }
   return ImageDimensions(width, height);
@@ -408,7 +408,7 @@ ImageDimensions GetClosestImageSize(Integration::ResourcePointer resourceBuffer,
           const bool                     read_res = headerFunction(input, width, height);
           if(!read_res)
           {
-            DALI_LOG_WARNING("Image Decoder failed to read header for resourceBuffer\n");
+            DALI_LOG_ERROR("Image Decoder failed to read header for resourceBuffer\n");
           }
         }
       }

diff --git a/dali/internal/imaging/common/loader-bmp.cpp b/dali/internal/imaging/common/loader-bmp.cpp
index 6752735..fe87cf9 100644 (file)
--- a/dali/internal/imaging/common/loader-bmp.cpp
+++ b/dali/internal/imaging/common/loader-bmp.cpp
@@ -94,11 +94,13 @@ bool LoadBmpHeader(FILE* fp, unsigned int& width, unsigned int& height, BmpFileH
 {
   if(!ReadHeader(fp, fileHeader))
   {
+    DALI_LOG_ERROR("File header read failed\n");
     return false;
   }
 
   if(!ReadHeader(fp, infoHeader))
   {
+    DALI_LOG_ERROR("Info header read failed\n");
     return false;
   }
 
@@ -107,6 +109,7 @@ bool LoadBmpHeader(FILE* fp, unsigned int& width, unsigned int& height, BmpFileH
 
   if(infoHeader.width == 0)
   {
+    DALI_LOG_ERROR("Invalid header size\n");
     return false;
   }
 
@@ -1106,7 +1109,7 @@ bool LoadBitmapFromBmp(const Dali::ImageLoader::Input& input, Dali::Devel::Pixel
           customizedFormat = BMP_RGB1;
           break;
         default:
-          DALI_LOG_WARNING("%d bits per pixel not supported for BMP files\n", infoHeader.bitsPerPixel);
+          DALI_LOG_ERROR("%d bits per pixel not supported for BMP files\n", infoHeader.bitsPerPixel);
           return false;
       }
       break;
@@ -1168,7 +1171,7 @@ bool LoadBitmapFromBmp(const Dali::ImageLoader::Input& input, Dali::Devel::Pixel
       break;
     }
     default:
-      DALI_LOG_WARNING("Compression not supported for BMP files\n");
+      DALI_LOG_ERROR("Compression not supported for BMP files\n");
       return false;
   }
 
@@ -1359,6 +1362,7 @@ bool LoadBitmapFromBmp(const Dali::ImageLoader::Input& input, Dali::Devel::Pixel
 
   if(!decodeResult)
   {
+    DALI_LOG_ERROR("Decoding failed\n");
     return false;
   }
 

diff --git a/dali/internal/imaging/common/loader-jpeg-turbo.cpp b/dali/internal/imaging/common/loader-jpeg-turbo.cpp
index ba57d0f..2068ef3 100644 (file)
--- a/dali/internal/imaging/common/loader-jpeg-turbo.cpp
+++ b/dali/internal/imaging/common/loader-jpeg-turbo.cpp
@@ -499,6 +499,7 @@ bool LoadJpegHeader(FILE* fp, unsigned int& width, unsigned int& height)
   // into this branch body for cleanup and error return:
   if(setjmp(jerr.jumpBuffer))
   {
+    DALI_LOG_ERROR("setjmp failed\n");
     jpeg_destroy_decompress(&cinfo);
     return false;
   }
@@ -514,6 +515,7 @@ bool LoadJpegHeader(FILE* fp, unsigned int& width, unsigned int& height)
   // Check header to see if it is  JPEG file
   if(jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK)
   {
+    DALI_LOG_ERROR("jpeg_read_header failed\n");
     width = height = 0;
     jpeg_destroy_decompress(&cinfo);
     return false;
@@ -546,6 +548,7 @@ bool LoadBitmapFromJpeg(const Dali::ImageLoader::Input& input, Dali::Devel::Pixe
 
   if(0u == jpegBufferSize)
   {
+    DALI_LOG_ERROR("Jpeg buffer size error\n");
     return false;
   }
 
@@ -570,7 +573,7 @@ bool LoadBitmapFromJpeg(const Dali::ImageLoader::Input& input, Dali::Devel::Pixe
   // Pull the compressed JPEG image bytes out of a file and into memory:
   if(fread(jpegBufferPtr, 1, jpegBufferSize, fp) != jpegBufferSize)
   {
-    DALI_LOG_WARNING("Error on image file read.\n");
+    DALI_LOG_ERROR("Error on image file read.\n");
     return false;
   }
 
@@ -637,7 +640,7 @@ bool LoadBitmapFromJpeg(const Dali::ImageLoader::Input& input, Dali::Devel::Pixe
 
   if(preXformImageWidth == 0 || preXformImageHeight == 0)
   {
-    DALI_LOG_WARNING("Invalid Image!\n");
+    DALI_LOG_ERROR("Invalid Image!\n");
     return false;
   }
 

diff --git a/dali/internal/imaging/common/loader-png.cpp b/dali/internal/imaging/common/loader-png.cpp
index e13a8ec..4d76f97 100644 (file)
--- a/dali/internal/imaging/common/loader-png.cpp
+++ b/dali/internal/imaging/common/loader-png.cpp
@@ -61,11 +61,13 @@ bool LoadPngHeader(FILE* fp, unsigned int& width, unsigned int& height, png_stru
   size_t size = fread(header, 1, 8, fp);
   if(size != 8)
   {
+    DALI_LOG_ERROR("fread failed\n");
     return false;
   }
 
   if(png_sig_cmp(header, 0, 8))
   {
+    DALI_LOG_ERROR("png_sig_cmp failed\n");
     return false;
   }
 
@@ -73,14 +75,14 @@ bool LoadPngHeader(FILE* fp, unsigned int& width, unsigned int& height, png_stru
 
   if(!png)
   {
-    DALI_LOG_WARNING("Can't create PNG read structure\n");
+    DALI_LOG_ERROR("Can't create PNG read structure\n");
     return false;
   }
 
   info = png_create_info_struct(png);
   if(!info)
   {
-    DALI_LOG_WARNING("png_create_info_struct failed\n");
+    DALI_LOG_ERROR("png_create_info_struct failed\n");
     return false;
   }
 
@@ -88,7 +90,7 @@ bool LoadPngHeader(FILE* fp, unsigned int& width, unsigned int& height, png_stru
 
   if(setjmp(png_jmpbuf(png)))
   {
-    DALI_LOG_WARNING("error during png_init_io\n");
+    DALI_LOG_ERROR("error during png_init_io\n");
     return false;
   }
 
@@ -259,7 +261,7 @@ bool LoadBitmapFromPng(const Dali::ImageLoader::Input& input, Dali::Devel::Pixel
 
   if(!valid)
   {
-    DALI_LOG_WARNING("Unsupported png format\n");
+    DALI_LOG_ERROR("Unsupported png format\n");
     return false;
   }
 
@@ -270,7 +272,7 @@ bool LoadBitmapFromPng(const Dali::ImageLoader::Input& input, Dali::Devel::Pixel
 
   if(setjmp(png_jmpbuf(png)))
   {
-    DALI_LOG_WARNING("error during png_read_image\n");
+    DALI_LOG_ERROR("error during png_read_image\n");
     return false;
   }