Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: third_party/libpng/pngconf.h

Issue 1467263003: third_party/libpng: update to 1.2.54 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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.52 - November 20, 2014 4 * libpng version 1.2.54, November 12, 2015
5 * Copyright (c) 1998-2013 Glenn Randers-Pehrson 5 *
6 * Copyright (c) 1998-2015 Glenn Randers-Pehrson
6 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) 7 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
7 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) 8 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
8 * 9 *
9 * This code is released under the libpng license. 10 * This code is released under the libpng license.
10 * For conditions of distribution and use, see the disclaimer 11 * For conditions of distribution and use, see the disclaimer
11 * and license in png.h 12 * and license in png.h
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
16 * starting here down to where it starts to typedef png_color, png_text, 16 * starting here down to where it starts to typedef png_color, png_text,
17 * and png_info. 17 * and png_info.
18 */ 18 */
19 19
20 #ifndef PNGCONF_H 20 #ifndef PNGCONF_H
21 #define PNGCONF_H 21 #define PNGCONF_H
22 22
23 #define PNG_1_2_X 23 #define PNG_1_2_X
24 24
(...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 878
879 /* 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
880 * how large, set these two limits to 0. 880 * how large, set these two limits to 0.
881 */ 881 */
882 #ifndef PNG_USER_CHUNK_CACHE_MAX 882 #ifndef PNG_USER_CHUNK_CACHE_MAX
883 # define PNG_USER_CHUNK_CACHE_MAX 32765 883 # define PNG_USER_CHUNK_CACHE_MAX 32765
884 #endif 884 #endif
885 885
886 /* Added at libpng-1.2.43 */ 886 /* Added at libpng-1.2.43 */
887 #ifndef PNG_USER_CHUNK_MALLOC_MAX 887 #ifndef PNG_USER_CHUNK_MALLOC_MAX
888 # define PNG_USER_CHUNK_MALLOC_MAX 0 888 # define PNG_USER_CHUNK_MALLOC_MAX 8000000
889 #endif 889 #endif
890 890
891 #ifndef PNG_LITERAL_SHARP 891 #ifndef PNG_LITERAL_SHARP
892 # define PNG_LITERAL_SHARP 0x23 892 # define PNG_LITERAL_SHARP 0x23
893 #endif 893 #endif
894 #ifndef PNG_LITERAL_LEFT_SQUARE_BRACKET 894 #ifndef PNG_LITERAL_LEFT_SQUARE_BRACKET
895 # define PNG_LITERAL_LEFT_SQUARE_BRACKET 0x5b 895 # define PNG_LITERAL_LEFT_SQUARE_BRACKET 0x5b
896 #endif 896 #endif
897 #ifndef PNG_LITERAL_RIGHT_SQUARE_BRACKET 897 #ifndef PNG_LITERAL_RIGHT_SQUARE_BRACKET
898 # define PNG_LITERAL_RIGHT_SQUARE_BRACKET 0x5d 898 # define PNG_LITERAL_RIGHT_SQUARE_BRACKET 0x5d
(...skipping 769 matching lines...) Expand 10 before | Expand all | Expand 10 after
1668 */ 1668 */
1669 #if (PNG_ZBUF_SIZE > 65536L) && defined(PNG_MAX_MALLOC_64K) 1669 #if (PNG_ZBUF_SIZE > 65536L) && defined(PNG_MAX_MALLOC_64K)
1670 # undef PNG_ZBUF_SIZE 1670 # undef PNG_ZBUF_SIZE
1671 # define PNG_ZBUF_SIZE 65536L 1671 # define PNG_ZBUF_SIZE 65536L
1672 #endif 1672 #endif
1673 1673
1674 /* Added at libpng-1.2.8 */ 1674 /* Added at libpng-1.2.8 */
1675 #endif /* PNG_VERSION_INFO_ONLY */ 1675 #endif /* PNG_VERSION_INFO_ONLY */
1676 1676
1677 #endif /* PNGCONF_H */ 1677 #endif /* PNGCONF_H */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698