projects / packages / texlive.git / blame
| Commit | Line | Data |
|---|---|---|
| 4d3925aa AM |
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 | |
| a9012357 | 3 | @@ -246,7 +246,7 @@ |
| 4 | unsigned char sigbytes[4]; | |
| 5 | rewind (png_file); | |
| 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; | |
| 9 | else return 1; | |
| 10 | } | |
| 11 | ||
| 4d3925aa AM |
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 | |
| a9012357 | 14 | @@ -146,7 +146,7 @@ |
| 15 | rewind (png_file); | |
| 16 | if (fread (sigbytes, 1, sizeof(sigbytes), png_file) != | |
| 17 | sizeof(sigbytes) || | |
| 18 | - (!png_check_sig (sigbytes, sizeof(sigbytes)))) | |
| 19 | + (png_sig_cmp (sigbytes, 0, sizeof(sigbytes)))) | |
| 20 | return 0; | |
| 21 | else | |
| 22 | return 1; | |
| 4d3925aa AM |
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 | |
| 25 | @@ -80,7 +80,7 @@ | |
| 26 | } | |
| 27 | if (fread (sigbytes, 1, sizeof(sigbytes), thumb_file) != | |
| 28 | sizeof(sigbytes) || | |
| 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"); | |
| 32 | return NULL; | |
| 33 | } | |
| 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 | |
| 36 | @@ -42,7 +42,7 @@ | |
| a9012357 | 37 | rewind (png_file); |
| 38 | if (fread (sigbytes, 1, sizeof(sigbytes), png_file) != | |
| 39 | sizeof(sigbytes) || | |
| 40 | - (!png_check_sig (sigbytes, sizeof(sigbytes)))) | |
| 41 | + (png_sig_cmp (sigbytes, 0, sizeof(sigbytes)))) | |
| 42 | return 0; | |
| 43 | else | |
| 44 | return 1; | |
| 4d3925aa AM |
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 | |
| a9012357 | 47 | @@ -101,7 +101,7 @@ |
| 48 | rewind (png_file); | |
| 49 | if (fread (sigbytes, 1, sizeof(sigbytes), png_file) != | |
| 50 | sizeof(sigbytes) || | |
| 51 | - (!png_check_sig (sigbytes, sizeof(sigbytes)))) | |
| 52 | + (png_sig_cmp (sigbytes, 0, sizeof(sigbytes)))) | |
| 53 | return 0; | |
| 54 | else | |
| 55 | return 1; | |
| 4d3925aa AM |
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 | |
| 58 | @@ -246,7 +246,7 @@ | |
| 59 | unsigned char sigbytes[4]; | |
| 60 | rewind (png_file); | |
| 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; | |
| 64 | else return 1; | |
| 65 | } | |
| 66 | ||
| 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 | |
| 69 | @@ -146,7 +146,7 @@ | |
| 70 | rewind (png_file); | |
| 71 | if (fread (sigbytes, 1, sizeof(sigbytes), png_file) != | |
| 72 | sizeof(sigbytes) || | |
| 73 | - (!png_check_sig (sigbytes, sizeof(sigbytes)))) | |
| 74 | + (png_sig_cmp (sigbytes, 0, sizeof(sigbytes)))) | |
| 75 | return 0; | |
| 76 | else | |
| 77 | return 1; | |
| 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 | |
| 80 | @@ -200,7 +200,7 @@ | |
| 81 | + strlen(zlib_version) | |
| 82 | #ifdef XETEX_OTHER | |
| 83 | + strlen(PNG_LIBPNG_VER_STRING) | |
| 84 | - + strlen(png_libpng_ver) | |
| 85 | + + strlen(png_get_header_ver(NULL)) | |
| 86 | + strlen(xpdfVersion) | |
| 87 | + 6 * 3 /* for fontconfig version #s (won't really need 3 digits per field!) */ | |
| 88 | #endif | |
| 89 | @@ -225,7 +225,7 @@ | |
| 90 | , | |
| 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), | |
| 95 | xpdfVersion | |
| 96 | #endif | |
| 97 | ); |