summaryrefslogtreecommitdiff
path: root/png.h
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@acm.org>2013-05-07 21:59:05 -0500
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2013-05-07 21:59:05 -0500
commit0c7ac064d307e8769aaa0f7b575fae05c605b767 (patch)
treebd48ea341d6566e997706dd7c53535393a299853 /png.h
parentdb67cba8d42f5f13a96ce6080a61567f66afd915 (diff)
downloadlibpng-0c7ac064d307e8769aaa0f7b575fae05c605b767.tar.gz
[libpng16] Added an option to force maximum window size for inflating.
For inflate, reverted previous fixes. Added fixitxt and pngdeflate to the built programs and removed warnings from the source code and timepng that are revealed as a result. Fixed fixitxt when the chunk length is more than 65535 (untested, no test case).
Diffstat (limited to 'png.h')
-rw-r--r--png.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/png.h b/png.h
index 076c9a25a..9f05ebd11 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.6.3beta05 - May 6, 2013
+ * libpng version 1.6.3beta05 - May 8, 2013
* Copyright (c) 1998-2013 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -11,7 +11,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- * libpng versions 0.97, January 1998, through 1.6.3beta05 - May 6, 2013: Glenn
+ * libpng versions 0.97, January 1998, through 1.6.3beta05 - May 8, 2013: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -207,7 +207,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.6.3beta05, May 6, 2013, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.6.3beta05, May 8, 2013, are
* Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are
* distributed according to the same disclaimer and license as libpng-1.2.5
* with the following individual added to the list of Contributing Authors:
@@ -319,7 +319,7 @@
* Y2K compliance in libpng:
* =========================
*
- * May 6, 2013
+ * May 8, 2013
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -387,7 +387,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.3beta05"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.6.3beta05 - May 6, 2013\n"
+ " libpng version 1.6.3beta05 - May 8, 2013\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
@@ -3268,7 +3268,8 @@ PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,
#ifdef PNG_ARM_NEON_API_SUPPORTED
# define PNG_ARM_NEON 0 /* HARDWARE: ARM Neon SIMD instructions supported */
#endif
-#define PNG_OPTION_NEXT 2 /* Next option - numbers must be even */
+#define PNG_MAXIMUM_INFLATE_WINDOW 2 /* SOFTWARE: force maximum window */
+#define PNG_OPTION_NEXT 4 /* Next option - numbers must be even */
/* Return values: NOTE: there are four values and 'off' is *not* zero */
#define PNG_OPTION_UNSET 0 /* Unset - defaults to off */