From 9dbdf3dcf3fd2da5d19a93774180e0dcae85c671 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Thu, 20 Nov 2008 00:41:56 +0100 Subject: Durchsucher -> Durchsuche --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 70cd99f3..8c1fabe7 100755 --- a/po/de.po +++ b/po/de.po @@ -2547,7 +2547,7 @@ msgid "Scan band EU VHF I" msgstr "Durchsuche EU VHF I" msgid "Scan band EU VHF III" -msgstr "Durchsucher EU VHF III" +msgstr "Durchsuche EU VHF III" msgid "Scan band US HIGH" msgstr "Durchsuche US HIGH" @@ -2556,7 +2556,7 @@ msgid "Scan band US HYPER" msgstr "Durchsuche US HYPER" msgid "Scan band US LOW" -msgstr "Durchsucher US LOW" +msgstr "Durchsuche US LOW" msgid "Scan band US MID" msgstr "Durchsuche US MID" -- cgit v1.2.3 From 3c31c5e7adaba2190409c39547ae4052ce5d83eb Mon Sep 17 00:00:00 2001 From: ghost Date: Thu, 20 Nov 2008 01:15:26 +0100 Subject: fix alpha channel for 1 or 2 bit pngs --- lib/gdi/picload.cpp | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/lib/gdi/picload.cpp b/lib/gdi/picload.cpp index 0fafeabd..c162f89d 100644 --- a/lib/gdi/picload.cpp +++ b/lib/gdi/picload.cpp @@ -288,24 +288,12 @@ static unsigned char *png_load(const char *file, int *ox, int *oy) 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); -- cgit v1.2.3 From d8cbf1fa62da972b6a86c6f56ee2bbafb072f0cb Mon Sep 17 00:00:00 2001 From: ghost Date: Thu, 20 Nov 2008 01:16:23 +0100 Subject: Revert "fix alpha channel for 1 or 2 bit pngs" This reverts commit 7944d659ae7007d55d21451f08312f975cc3f25f. --- png_load.diff | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 png_load.diff diff --git a/png_load.diff b/png_load.diff deleted file mode 100644 index 9a5a6894..00000000 --- a/png_load.diff +++ /dev/null @@ -1,32 +0,0 @@ -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); -- cgit v1.2.3