Support L8 for jpeg and png

Change-Id: I2689962b4e2966aae1cdf720b9f7fa8a09b23ba6

diff --git a/dali/internal/imaging/common/loader-jpeg-turbo.cpp b/dali/internal/imaging/common/loader-jpeg-turbo.cpp
index cfb8fde..45b112c 100644 (file)
--- a/dali/internal/imaging/common/loader-jpeg-turbo.cpp
+++ b/dali/internal/imaging/common/loader-jpeg-turbo.cpp
@@ -1013,6 +1013,11 @@ bool EncodeToJpeg(const uint8_t* const pixelBuffer, Vector<uint8_t>& encodedPixe
 
   switch(pixelFormat)
   {
+    case Pixel::L8:
+    {
+      jpegPixelFormat = TJPF_GRAY;
+      break;
+    }
     case Pixel::RGB888:
     {
       jpegPixelFormat = TJPF_RGB;

diff --git a/dali/internal/imaging/common/loader-png.cpp b/dali/internal/imaging/common/loader-png.cpp
index 9c6d4f1..a84b205 100644 (file)
--- a/dali/internal/imaging/common/loader-png.cpp
+++ b/dali/internal/imaging/common/loader-png.cpp
@@ -417,6 +417,18 @@ bool EncodeToPng(const unsigned char* const pixelBuffer, Vector<unsigned char>&
   // Account for RGB versus BGR and presence of alpha in input pixels:
   switch(pixelFormat)
   {
+    case Pixel::L8:
+    {
+      pngPixelFormat = PNG_COLOR_TYPE_GRAY;
+      pixelBytes     = 1;
+      break;
+    }
+    case Pixel::LA88:
+    {
+      pngPixelFormat = PNG_COLOR_TYPE_GRAY_ALPHA;
+      pixelBytes     = 2;
+      break;
+    }
     case Pixel::RGB888:
     {
       pngPixelFormat = PNG_COLOR_TYPE_RGB;