1 diff -Naur emacs-23.1-orig/src/image.c emacs-23.1/src/image.c
2 --- emacs-23.1-orig/src/image.c 2010-01-17 23:12:10.000000000 -0500
3 +++ emacs-23.1/src/image.c 2010-01-17 23:18:16.000000000 -0500
5 /* PNG library details. */
7 DEF_IMGLIB_FN (png_get_io_ptr);
8 -DEF_IMGLIB_FN (png_check_sig);
9 +DEF_IMGLIB_FN (png_sig_cmp);
10 DEF_IMGLIB_FN (png_create_read_struct);
11 DEF_IMGLIB_FN (png_create_info_struct);
12 DEF_IMGLIB_FN (png_destroy_read_struct);
16 LOAD_IMGLIB_FN (library, png_get_io_ptr);
17 - LOAD_IMGLIB_FN (library, png_check_sig);
18 + LOAD_IMGLIB_FN (library, png_sig_cmp);
19 LOAD_IMGLIB_FN (library, png_create_read_struct);
20 LOAD_IMGLIB_FN (library, png_create_info_struct);
21 LOAD_IMGLIB_FN (library, png_destroy_read_struct);
25 #define fn_png_get_io_ptr png_get_io_ptr
26 -#define fn_png_check_sig png_check_sig
27 +#define fn_png_sig_cmp png_sig_cmp
28 #define fn_png_create_read_struct png_create_read_struct
29 #define fn_png_create_info_struct png_create_info_struct
30 #define fn_png_destroy_read_struct png_destroy_read_struct
33 /* Check PNG signature. */
34 if (fread (sig, 1, sizeof sig, fp) != sizeof sig
35 - || !fn_png_check_sig (sig, sizeof sig))
36 + || fn_png_sig_cmp (sig, 0, sizeof sig))
38 image_error ("Not a PNG file: `%s'", file, Qnil);
42 /* Check PNG signature. */
43 if (tbr.len < sizeof sig
44 - || !fn_png_check_sig (tbr.bytes, sizeof sig))
45 + || fn_png_sig_cmp (tbr.bytes, 0, sizeof sig))
47 image_error ("Not a PNG image: `%s'", img->spec, Qnil);