1 --- fvwm-2.5.28-orig/libs/PictureImageLoader.c 2010-01-19 23:04:51.000000000 -0500
2 +++ fvwm-2.5.28/libs/PictureImageLoader.c 2010-01-19 23:09:12.000000000 -0500
6 fread(buf, 1, FPNG_BYTES_TO_CHECK, f);
7 - if (!Fpng_check_sig(buf, FPNG_BYTES_TO_CHECK))
8 + if (Fpng_sig_cmp(buf, 0, FPNG_BYTES_TO_CHECK))
13 Fpng_set_gray_to_rgb(Fpng_ptr);
14 if (Fpng_get_bit_depth(Fpng_ptr, Finfo_ptr) < 8)
16 - Fpng_set_gray_1_2_4_to_8(Fpng_ptr);
17 + Fpng_set_expand_gray_1_2_4_to_8(Fpng_ptr);
20 for (i = 0; i < h; i++)
21 --- fvwm-2.5.28-orig/libs/Fpng.h 2010-01-19 23:13:34.000000000 -0500
22 +++ fvwm-2.5.28/libs/Fpng.h 2010-01-19 23:15:57.000000000 -0500
24 #define FPNG_FILLER_AFTER PNG_FILLER_AFTER
25 #define FPNG_INFO_tRNS PNG_INFO_tRNS
27 -#define Fpng_check_sig(a,b) png_check_sig(a,b)
28 +#define Fpng_sig_cmp(a,b,c) png_sig_cmp(a,b,c)
29 #define Fpng_create_read_struct(a,b,c,d) png_create_read_struct(a,b,c,d)
30 #define Fpng_create_info_struct(a) png_create_info_struct(a)
31 #define Fpng_destroy_read_struct(a,b,c) png_destroy_read_struct(a,b,c)
33 #define Fpng_set_packing(a) png_set_packing(a)
34 #define Fpng_set_gray_to_rgb(a) png_set_gray_to_rgb(a)
35 #define Fpng_get_bit_depth(a,b) png_get_bit_depth(a,b)
36 -#define Fpng_set_gray_1_2_4_to_8(a) png_set_gray_1_2_4_to_8(a)
37 +#define Fpng_set_expand_gray_1_2_4_to_8(a) png_set_expand_gray_1_2_4_to_8(a)
38 #define Fpng_get_valid(a,b,c) png_get_valid(a,b,c)
39 #define Fpng_read_end(a,b) png_read_end(a,b)
40 #define Fpng_set_interlace_handling(a) png_set_interlace_handling(a)