From: ghost <andreas.monzner@multimedia-labs.de>
Date: Tue, 18 Nov 2008 22:36:25 +0000 (+0100)
Subject: fix alpha channel for 1 or 2 bit pngs
X-Git-Tag: 2.6.0~587
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/7944d659ae7007d55d21451f08312f975cc3f25f?ds=sidebyside

fix alpha channel for 1 or 2 bit pngs
---

diff --git a/png_load.diff b/png_load.diff
new file mode 100644
index 00000000..9a5a6894
--- /dev/null
+++ b/png_load.diff
@@ -0,0 +1,32 @@
+diff -Naur enigma2.orig/lib/gdi/picload.cpp enigma2/lib/gdi/picload.cpp
+--- enigma2.orig/lib/gdi/picload.cpp	2008-11-18 21:52:44.000000000 +0100
++++ enigma2/lib/gdi/picload.cpp	2008-11-18 22:38:34.000000000 +0100
+@@ -288,24 +288,12 @@
+ 	png_read_info(png_ptr, info_ptr);
+ 	png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL);
+ 
+-	if (color_type == PNG_COLOR_TYPE_PALETTE)
+-	{
+-		png_set_palette_to_rgb(png_ptr);
+-		png_set_background(png_ptr, (png_color_16 *)&my_background, PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
+-	}
+-	if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+-	{
+-		png_set_gray_to_rgb(png_ptr);
+-		png_set_background(png_ptr, (png_color_16 *)&my_background, PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
+-	}
+-	if (color_type & PNG_COLOR_MASK_ALPHA)
+-		png_set_strip_alpha(png_ptr);
+-
+-	if (bit_depth < 8)
+-		png_set_packing(png_ptr);
+-
++	if ((color_type == PNG_COLOR_TYPE_PALETTE)||(color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)||(png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
++		png_set_expand(png_ptr);
+ 	if (bit_depth == 16)
+ 		png_set_strip_16(png_ptr);
++	if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
++		png_set_gray_to_rgb(png_ptr);
+ 
+ 	int number_passes = png_set_interlace_handling(png_ptr);
+ 	png_read_update_info(png_ptr, info_ptr);