| OLD | NEW |
| 1 | 1 |
| 2 /* pngconf.h - machine configurable file for libpng | 2 /* pngconf.h - machine configurable file for libpng |
| 3 * | 3 * |
| 4 * libpng version 1.2.45 - July 7, 2011 | 4 * libpng version 1.2.52 - November 20, 2014 |
| 5 * Copyright (c) 1998-2011 Glenn Randers-Pehrson | 5 * Copyright (c) 1998-2013 Glenn Randers-Pehrson |
| 6 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) | 6 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) |
| 7 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) | 7 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) |
| 8 * | 8 * |
| 9 * This code is released under the libpng license. | 9 * This code is released under the libpng license. |
| 10 * For conditions of distribution and use, see the disclaimer | 10 * For conditions of distribution and use, see the disclaimer |
| 11 * and license in png.h | 11 * and license in png.h |
| 12 */ | 12 */ |
| 13 | 13 |
| 14 /* Any machine specific code is near the front of this file, so if you | 14 /* Any machine specific code is near the front of this file, so if you |
| 15 * are configuring libpng for a machine, you may want to read the section | 15 * are configuring libpng for a machine, you may want to read the section |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 /* End of material added to libpng-1.2.8 */ | 79 /* End of material added to libpng-1.2.8 */ |
| 80 | 80 |
| 81 /* Added at libpng-1.2.19, removed at libpng-1.2.20 because it caused trouble | 81 /* Added at libpng-1.2.19, removed at libpng-1.2.20 because it caused trouble |
| 82 Restored at libpng-1.2.21 */ | 82 Restored at libpng-1.2.21 */ |
| 83 #if !defined(PNG_NO_WARN_UNINITIALIZED_ROW) && \ | 83 #if !defined(PNG_NO_WARN_UNINITIALIZED_ROW) && \ |
| 84 !defined(PNG_WARN_UNINITIALIZED_ROW) | 84 !defined(PNG_WARN_UNINITIALIZED_ROW) |
| 85 # define PNG_WARN_UNINITIALIZED_ROW 1 | 85 # define PNG_WARN_UNINITIALIZED_ROW 1 |
| 86 #endif | 86 #endif |
| 87 /* End of material added at libpng-1.2.19/1.2.21 */ | 87 /* End of material added at libpng-1.2.19/1.2.21 */ |
| 88 | 88 |
| 89 /* Added at libpng-1.2.51 (ported from 1.4.6) */ |
| 90 #ifndef PNG_UNUSED |
| 91 /* Unused formal parameter warnings are silenced using the following macro |
| 92 * which is expected to have no bad effects on performance (optimizing |
| 93 * compilers will probably remove it entirely). Note that if you replace |
| 94 * it with something other than whitespace, you must include the terminating |
| 95 * semicolon. |
| 96 */ |
| 97 # define PNG_UNUSED(param) (void)param; |
| 98 #endif |
| 99 /* End of material added to libpng-1.4.6 */ |
| 100 |
| 89 /* This is the size of the compression buffer, and thus the size of | 101 /* This is the size of the compression buffer, and thus the size of |
| 90 * an IDAT chunk. Make this whatever size you feel is best for your | 102 * an IDAT chunk. Make this whatever size you feel is best for your |
| 91 * machine. One of these will be allocated per png_struct. When this | 103 * machine. One of these will be allocated per png_struct. When this |
| 92 * is full, it writes the data to the disk, and does some other | 104 * is full, it writes the data to the disk, and does some other |
| 93 * calculations. Making this an extremely small size will slow | 105 * calculations. Making this an extremely small size will slow |
| 94 * the library down, but you may want to experiment to determine | 106 * the library down, but you may want to experiment to determine |
| 95 * where it becomes significant, if you are concerned with memory | 107 * where it becomes significant, if you are concerned with memory |
| 96 * usage. Note that zlib allocates at least 32Kb also. For readers, | 108 * usage. Note that zlib allocates at least 32Kb also. For readers, |
| 97 * this describes the size of the buffer available to read the data in. | 109 * this describes the size of the buffer available to read the data in. |
| 98 * Unless this gets smaller than the size of a row (compressed), | 110 * Unless this gets smaller than the size of a row (compressed), |
| (...skipping 762 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 861 # define PNG_USER_WIDTH_MAX 1000000L | 873 # define PNG_USER_WIDTH_MAX 1000000L |
| 862 #endif | 874 #endif |
| 863 #ifndef PNG_USER_HEIGHT_MAX | 875 #ifndef PNG_USER_HEIGHT_MAX |
| 864 # define PNG_USER_HEIGHT_MAX 1000000L | 876 # define PNG_USER_HEIGHT_MAX 1000000L |
| 865 #endif | 877 #endif |
| 866 | 878 |
| 867 /* Added at libpng-1.2.43. To accept all valid PNGs no matter | 879 /* Added at libpng-1.2.43. To accept all valid PNGs no matter |
| 868 * how large, set these two limits to 0. | 880 * how large, set these two limits to 0. |
| 869 */ | 881 */ |
| 870 #ifndef PNG_USER_CHUNK_CACHE_MAX | 882 #ifndef PNG_USER_CHUNK_CACHE_MAX |
| 871 # define PNG_USER_CHUNK_CACHE_MAX 0 | 883 # define PNG_USER_CHUNK_CACHE_MAX 32765 |
| 872 #endif | 884 #endif |
| 873 | 885 |
| 874 /* Added at libpng-1.2.43 */ | 886 /* Added at libpng-1.2.43 */ |
| 875 #ifndef PNG_USER_CHUNK_MALLOC_MAX | 887 #ifndef PNG_USER_CHUNK_MALLOC_MAX |
| 876 # define PNG_USER_CHUNK_MALLOC_MAX 0 | 888 # define PNG_USER_CHUNK_MALLOC_MAX 0 |
| 877 #endif | 889 #endif |
| 878 | 890 |
| 879 #ifndef PNG_LITERAL_SHARP | 891 #ifndef PNG_LITERAL_SHARP |
| 880 # define PNG_LITERAL_SHARP 0x23 | 892 # define PNG_LITERAL_SHARP 0x23 |
| 881 #endif | 893 #endif |
| (...skipping 774 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1656 */ | 1668 */ |
| 1657 #if (PNG_ZBUF_SIZE > 65536L) && defined(PNG_MAX_MALLOC_64K) | 1669 #if (PNG_ZBUF_SIZE > 65536L) && defined(PNG_MAX_MALLOC_64K) |
| 1658 # undef PNG_ZBUF_SIZE | 1670 # undef PNG_ZBUF_SIZE |
| 1659 # define PNG_ZBUF_SIZE 65536L | 1671 # define PNG_ZBUF_SIZE 65536L |
| 1660 #endif | 1672 #endif |
| 1661 | 1673 |
| 1662 /* Added at libpng-1.2.8 */ | 1674 /* Added at libpng-1.2.8 */ |
| 1663 #endif /* PNG_VERSION_INFO_ONLY */ | 1675 #endif /* PNG_VERSION_INFO_ONLY */ |
| 1664 | 1676 |
| 1665 #endif /* PNGCONF_H */ | 1677 #endif /* PNGCONF_H */ |
| OLD | NEW |