- up to 2.6.5-1

[packages/fvwm2.git] / fvwm2-libpng14.patch

diff --git a/fvwm2-libpng14.patch b/fvwm2-libpng14.patch
deleted file mode 100644 (file)
index ae69d0f..0000000
--- a/fvwm2-libpng14.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- fvwm-2.5.28-orig/libs/PictureImageLoader.c 2010-01-19 23:04:51.000000000 -0500
-+++ fvwm-2.5.28/libs/PictureImageLoader.c      2010-01-19 23:09:12.000000000 -0500
-@@ -417,7 +417,7 @@
-               return False;
-       }
-       fread(buf, 1, FPNG_BYTES_TO_CHECK, f);
--      if (!Fpng_check_sig(buf, FPNG_BYTES_TO_CHECK))
-+      if (Fpng_sig_cmp(buf, 0, FPNG_BYTES_TO_CHECK))
-       {
-               fclose(f);
-               return False;
-@@ -503,7 +503,7 @@
-               Fpng_set_gray_to_rgb(Fpng_ptr);
-               if (Fpng_get_bit_depth(Fpng_ptr, Finfo_ptr) < 8)
-               {
--                      Fpng_set_gray_1_2_4_to_8(Fpng_ptr);
-+                      Fpng_set_expand_gray_1_2_4_to_8(Fpng_ptr);
-               }
-       }
-       for (i = 0; i < h; i++)
---- fvwm-2.5.28-orig/libs/Fpng.h       2010-01-19 23:13:34.000000000 -0500
-+++ fvwm-2.5.28/libs/Fpng.h    2010-01-19 23:15:57.000000000 -0500
-@@ -429,7 +429,7 @@
- #define FPNG_FILLER_AFTER PNG_FILLER_AFTER
- #define FPNG_INFO_tRNS PNG_INFO_tRNS
- 
--#define Fpng_check_sig(a,b) png_check_sig(a,b)
-+#define Fpng_sig_cmp(a,b,c) png_sig_cmp(a,b,c)
- #define Fpng_create_read_struct(a,b,c,d) png_create_read_struct(a,b,c,d)
- #define Fpng_create_info_struct(a) png_create_info_struct(a)
- #define Fpng_destroy_read_struct(a,b,c) png_destroy_read_struct(a,b,c)
-@@ -444,7 +444,7 @@
- #define Fpng_set_packing(a) png_set_packing(a)
- #define Fpng_set_gray_to_rgb(a) png_set_gray_to_rgb(a)
- #define Fpng_get_bit_depth(a,b) png_get_bit_depth(a,b)
--#define Fpng_set_gray_1_2_4_to_8(a) png_set_gray_1_2_4_to_8(a)
-+#define Fpng_set_expand_gray_1_2_4_to_8(a) png_set_expand_gray_1_2_4_to_8(a)
- #define Fpng_get_valid(a,b,c) png_get_valid(a,b,c)
- #define Fpng_read_end(a,b) png_read_end(a,b)
- #define Fpng_set_interlace_handling(a) png_set_interlace_handling(a)