Merge "DALi Version 1.2.64" into devel/master

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 8d3b74d..04b8b10 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -115,8 +115,6 @@ BuildRequires:  pkgconfig(utilX)
 %endif
 
 # for dali-adaptor
-BuildRequires:  pkgconfig(evas)
-
 %if 0%{?tizen_version_major} == 3
 BuildRequires:  pkgconfig(capi-appfw-application)
 BuildRequires:  pkgconfig(elementary)

diff --git a/platform-abstractions/tizen/image-loaders/loader-png.cpp b/platform-abstractions/tizen/image-loaders/loader-png.cpp
index 89bca77..09e8819 100755 (executable)
--- a/platform-abstractions/tizen/image-loaders/loader-png.cpp
+++ b/platform-abstractions/tizen/image-loaders/loader-png.cpp
@@ -162,37 +162,30 @@ bool LoadBitmapFromPng( const ImageLoader::Input& input, Integration::Bitmap& bi
 
   png_byte colortype = png_get_color_type(png, info);
 
-  if(colortype == PNG_COLOR_TYPE_GRAY)
+  if( colortype == PNG_COLOR_TYPE_GRAY ||
+      colortype == PNG_COLOR_TYPE_GRAY_ALPHA )
   {
-    switch( colordepth )
+    if( png_get_valid(png, info, PNG_INFO_tRNS) )
     {
-      case 8:
-      {
-        pixelFormat = Pixel::L8;
-        valid = true;
-        break;
-      }
-      default:
-      {
-        break;
-      }
+      colortype = PNG_COLOR_TYPE_GRAY_ALPHA;
+      /* expand transparency entry -> alpha channel if present */
+      png_set_tRNS_to_alpha(png);
+      pixelFormat = Pixel::LA88;
     }
-  }
-  else if(colortype == PNG_COLOR_TYPE_GRAY_ALPHA)
-  {
-    switch(colordepth)
+    else
     {
-      case 8:
-      {
-        pixelFormat = Pixel::LA88;
-        valid = true;
-        break;
-      }
-      default:
-      {
-        break;
-      }
+      colortype = PNG_COLOR_TYPE_GRAY;
+      pixelFormat = Pixel::L8;
+    }
+
+    if( colordepth < 8 )
+    {
+      /* expand gray (w/reduced bits) -> 8-bit RGB if necessary */
+      png_set_expand_gray_1_2_4_to_8(png);
+      /* pack all pixels to byte boundaries */
+      png_set_packing(png);
     }
+    valid = true;
   }
   else if(colortype == PNG_COLOR_TYPE_RGB )
   {