1 --- texk/dvipdfmx/src/xbb.c~ 2008-05-24 18:50:54.000000000 +0200
2 +++ texk/dvipdfmx/src/xbb.c 2010-02-02 08:48:15.046585508 +0100
4 unsigned char sigbytes[4];
6 if (fread(sigbytes, 1, sizeof(sigbytes), png_file) != sizeof(sigbytes) ||
7 - (!png_check_sig (sigbytes, sizeof(sigbytes)))) return 0;
8 + (png_sig_cmp (sigbytes, 0, sizeof(sigbytes)))) return 0;
12 --- texk/dvipdfmx/src/pngimage.c~ 2008-04-21 02:43:12.000000000 +0200
13 +++ texk/dvipdfmx/src/pngimage.c 2010-02-02 08:48:46.656790759 +0100
16 if (fread (sigbytes, 1, sizeof(sigbytes), png_file) !=
18 - (!png_check_sig (sigbytes, sizeof(sigbytes))))
19 + (png_sig_cmp (sigbytes, 0, sizeof(sigbytes))))
23 --- texk/dvipdfm/thumbnail.c~ 2006-01-17 22:41:51.000000000 +0100
24 +++ texk/dvipdfm/thumbnail.c 2010-02-02 08:49:20.553252415 +0100
27 if (fread (sigbytes, 1, sizeof(sigbytes), thumb_file) !=
29 - (!png_check_sig (sigbytes, sizeof(sigbytes)))) {
30 + (png_sig_cmp (sigbytes, 0, sizeof(sigbytes)))) {
31 fprintf (stderr, "\nThumbnail not a png file! Skipping\n");
34 --- texk/dvipdfm/pngimage.c~ 2006-01-17 22:41:51.000000000 +0100
35 +++ texk/dvipdfm/pngimage.c 2010-02-02 08:49:52.673256038 +0100
38 if (fread (sigbytes, 1, sizeof(sigbytes), png_file) !=
40 - (!png_check_sig (sigbytes, sizeof(sigbytes))))
41 + (png_sig_cmp (sigbytes, 0, sizeof(sigbytes))))
45 --- texk/web2c/xetexdir/pngimage.c~ 2006-07-26 18:19:45.000000000 +0200
46 +++ texk/web2c/xetexdir/pngimage.c 2010-02-02 08:50:56.269902747 +0100
49 if (fread (sigbytes, 1, sizeof(sigbytes), png_file) !=
51 - (!png_check_sig (sigbytes, sizeof(sigbytes))))
52 + (png_sig_cmp (sigbytes, 0, sizeof(sigbytes))))
56 --- texk/xdvipdfmx/src/xbb.c~ 2008-05-25 17:00:35.000000000 +0200
57 +++ texk/xdvipdfmx/src/xbb.c 2010-02-02 08:51:27.863441254 +0100
59 unsigned char sigbytes[4];
61 if (fread(sigbytes, 1, sizeof(sigbytes), png_file) != sizeof(sigbytes) ||
62 - (!png_check_sig (sigbytes, sizeof(sigbytes)))) return 0;
63 + (png_sig_cmp (sigbytes, 0, sizeof(sigbytes)))) return 0;
67 --- texk/xdvipdfmx/src/pngimage.c~ 2007-11-22 17:48:06.000000000 +0100
68 +++ texk/xdvipdfmx/src/pngimage.c 2010-02-02 08:52:01.387188159 +0100
71 if (fread (sigbytes, 1, sizeof(sigbytes), png_file) !=
73 - (!png_check_sig (sigbytes, sizeof(sigbytes))))
74 + (png_sig_cmp (sigbytes, 0, sizeof(sigbytes))))
78 --- texk/web2c/xetexdir/XeTeX_ext.c.org 2010-02-02 09:11:16.226655687 +0100
79 +++ texk/web2c/xetexdir/XeTeX_ext.c 2010-02-02 09:14:23.969761702 +0100
81 + strlen(zlib_version)
83 + strlen(PNG_LIBPNG_VER_STRING)
84 - + strlen(png_libpng_ver)
85 + + strlen(png_get_header_ver(NULL))
87 + 6 * 3 /* for fontconfig version #s (won't really need 3 digits per field!) */
91 FC_VERSION / 10000, (FC_VERSION % 10000) / 100, FC_VERSION % 100,
92 fc_version / 10000, (fc_version % 10000) / 100, fc_version % 100,
93 - PNG_LIBPNG_VER_STRING, png_libpng_ver,
94 + PNG_LIBPNG_VER_STRING, png_get_header_ver(NULL),