diff options
| author | Fraxinas <andreas.frisch@multimedia-labs.de> | 2008-11-20 12:18:17 +0100 |
|---|---|---|
| committer | Fraxinas <andreas.frisch@multimedia-labs.de> | 2008-11-20 12:18:17 +0100 |
| commit | 075bcb25231dc0e39314f3bb1bbd553f6535446d (patch) | |
| tree | 311b544cced60ea4f812a97aa974f3b64fb597b6 | |
| parent | 5a626462406c008da1c81cf304a448d9abd19576 (diff) | |
| parent | a4c061ed8e7ec8355a3b2f972ac5a4ee33cc7c25 (diff) | |
| download | enigma2-075bcb25231dc0e39314f3bb1bbd553f6535446d.tar.gz enigma2-075bcb25231dc0e39314f3bb1bbd553f6535446d.zip | |
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
| -rw-r--r-- | lib/gdi/picload.cpp | 20 | ||||
| -rw-r--r-- | png_load.diff | 32 | ||||
| -rwxr-xr-x | po/de.po | 4 |
3 files changed, 6 insertions, 50 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); 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); @@ -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" |