[libpng17] Imported from libpng-1.7.0beta16.tarv1.7.0beta16

17 files changed, 41 insertions, 37 deletions

diff --git a/ANNOUNCE b/ANNOUNCE
index 46762d3c6..898982a3d 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.7.0beta16 - July 3, 2013
+Libpng 1.7.0beta16 - July 5, 2013
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -331,7 +331,7 @@ Version 1.7.0beta14 [June 8, 2013]
 Version 1.7.0beta15 [June 18, 2013]
   Revised libpng.3 so that "doclifter" can process it.
 
-Version 1.7.0beta16 [July 3, 2013]
+Version 1.7.0beta16 [July 5, 2013]
   Revised example.c to illustrate use of PNG_DEFAULT_sRGB and PNG_GAMMA_MAC_18
     as parameters for png_set_gamma().  These have been available since
     libpng-1.5.4.
diff --git a/CHANGES b/CHANGES
index de0081401..eec3befe1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4619,7 +4619,7 @@ Version 1.7.0beta14 [June 8, 2013]
 Version 1.7.0beta15 [June 18, 2013]
   Revised libpng.3 so that "doclifter" can process it.
 
-Version 1.7.0beta16 [July 3, 2013]
+Version 1.7.0beta16 [July 5, 2013]
   Revised example.c to illustrate use of PNG_DEFAULT_sRGB and PNG_GAMMA_MAC_18
     as parameters for png_set_gamma().  These have been available since
     libpng-1.5.4.
diff --git a/LICENSE b/LICENSE
index 20e6ea16e..b14f4a7cd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.2.6, August 15, 2004, through 1.7.0beta16, June 18, 2013, are
+libpng versions 1.2.6, August 15, 2004, through 1.7.0beta16, July 5, 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
@@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-June 18, 2013
+July 5, 2013
diff --git a/README b/README
index a3ac83fb4..82b320c67 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.7.0beta16 - June 18, 2013 (shared library 17.0)
+README for libpng version 1.7.0beta16 - July 5, 2013 (shared library 17.0)
 See the note about version numbers near the top of png.h
 
 See INSTALL for instructions on how to install libpng.
diff --git a/contrib/libtests/pngunknown.c b/contrib/libtests/pngunknown.c
index 7f5a81d43..950b6c258 100644
--- a/contrib/libtests/pngunknown.c
+++ b/contrib/libtests/pngunknown.c
@@ -1,8 +1,8 @@
 
 /* pngunknown.c - test the read side unknown chunk handling
  *
- * Last changed in libpng 1.6.0 [(PENDING RELEASE)]
- * Copyright (c) 2012 Glenn Randers-Pehrson
+ * Last changed in libpng 1.7.0 [(PENDING RELEASE)]
+ * Copyright (c) 2013 Glenn Randers-Pehrson
  * Written by John Cunningham Bowler
  *
  * This code is released under the libpng license.
@@ -75,7 +75,7 @@ typedef png_byte *png_const_bytep;
 #  define png_const_structp png_structp
 #endif
 
-/* Types of chunks not know to libpng */
+/* Types of chunks not known to libpng */
 #define png_vpAg PNG_U32(118, 112, 65, 103)
 
 /* Chunk information */
diff --git a/contrib/libtests/readpng.c b/contrib/libtests/readpng.c
index c5baef53d..7ba46d0b9 100644
--- a/contrib/libtests/readpng.c
+++ b/contrib/libtests/readpng.c
@@ -2,7 +2,7 @@
  *
  * Copyright (c) 2013 John Cunningham Bowler
  *
- * Last changed in libpng 1.6.0 [(PENDING RELEASE)]
+ * Last changed in libpng 1.6.1 [March 28, 2013]
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer
diff --git a/libpng-manual.txt b/libpng-manual.txt
index 7a2bdf05b..83306db6e 100644
--- a/libpng-manual.txt
+++ b/libpng-manual.txt
@@ -1,6 +1,6 @@
 libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.7.0beta16 - July 2, 2013
+ libpng version 1.7.0beta16 - July 5, 2013
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2013 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.7.0beta16 - July 2, 2013
+ libpng versions 0.97, January 1998, through 1.7.0beta16 - July 5, 2013
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2013 Glenn Randers-Pehrson
 
@@ -5236,7 +5236,7 @@ Other rules can be inferred by inspecting the libpng source.
 
 XVII. Y2K Compliance in libpng
 
-July 2, 2013
+July 5, 2013
 
 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
diff --git a/libpng.3 b/libpng.3
index d9b9abd41..c39135e49 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "July 2, 2013"
+.TH LIBPNG 3 "July 5, 2013"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta16
 .SH SYNOPSIS
@@ -494,7 +494,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
 .SH LIBPNG.TXT
 libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.7.0beta16 - July 2, 2013
+ libpng version 1.7.0beta16 - July 5, 2013
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2013 Glenn Randers-Pehrson
@@ -505,7 +505,7 @@ libpng-manual.txt - A description on how to use and modify libpng
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.7.0beta16 - July 2, 2013
+ libpng versions 0.97, January 1998, through 1.7.0beta16 - July 5, 2013
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2013 Glenn Randers-Pehrson
 
@@ -5731,7 +5731,7 @@ Other rules can be inferred by inspecting the libpng source.
 
 .SH XVII. Y2K Compliance in libpng
 
-July 2, 2013
+July 5, 2013
 
 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
@@ -6001,7 +6001,7 @@ possible without all of you.
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.7.0beta16 - July 2, 2013:
+Libpng version 1.7.0beta16 - July 5, 2013:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
 
@@ -6024,7 +6024,7 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.2.6, August 15, 2004, through 1.7.0beta16, July 2, 2013, are
+libpng versions 1.2.6, August 15, 2004, through 1.7.0beta16, July 5, 2013, are
 Copyright (c) 2004,2006-2007 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
@@ -6123,7 +6123,7 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-July 2, 2013
+July 5, 2013
 
 .\" end of man page
 
diff --git a/libpngpf.3 b/libpngpf.3
index 15b3ad383..e293436af 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "June 18, 2013"
+.TH LIBPNGPF 3 "July 5, 2013"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta16
 (private functions)
diff --git a/png.5 b/png.5
index b48b2d1f3..2ab8711f2 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "June 18, 2013"
+.TH PNG 5 "July 5, 2013"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
diff --git a/png.c b/png.c
index 3e2e8ee48..fbe4caa28 100644
--- a/png.c
+++ b/png.c
@@ -691,13 +691,13 @@ png_get_copyright(png_const_structrp png_ptr)
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-     "libpng version 1.7.0beta16 - June 18, 2013" PNG_STRING_NEWLINE \
+     "libpng version 1.7.0beta16 - July 5, 2013" PNG_STRING_NEWLINE \
      "Copyright (c) 1998-2013 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
      "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
      "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
      PNG_STRING_NEWLINE;
 #  else
-      return "libpng version 1.7.0beta16 - June 18, 2013\
+      return "libpng version 1.7.0beta16 - July 5, 2013\
       Copyright (c) 1998-2013 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
diff --git a/png.h b/png.h
index cf5e455f5..c49a77651 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.7.0beta16 - June 18, 2013
+ * libpng version 1.7.0beta16 - July 5, 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.7.0beta16 - June 18, 2013: Glenn
+ *   libpng versions 0.97, January 1998, through 1.7.0beta16 - July 5, 2013: Glenn
  *   See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -200,7 +200,7 @@
  *
  * This code is released under the libpng license.
  *
- * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta16, June 18, 2013, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta16, July 5, 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:
@@ -312,7 +312,7 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    June 18, 2013
+ *    July 5, 2013
  *
  *    Since the PNG Development group is an ad-hoc body, we can't make
  *    an official declaration.
@@ -380,7 +380,7 @@
 /* Version information for png.h - this should match the version in png.c */
 #define PNG_LIBPNG_VER_STRING "1.7.0beta16"
 #define PNG_HEADER_VERSION_STRING \
-     " libpng version 1.7.0beta16 - June 18, 2013\n"
+     " libpng version 1.7.0beta16 - July 5, 2013\n"
 
 #define PNG_LIBPNG_VER_SONUM   17
 #define PNG_LIBPNG_VER_DLLNUM  17
@@ -527,7 +527,7 @@
  * For historical reasons these constants have the form png_<name>; i.e.
  * the prefix is lower case.  Please use decimal values as the parameters to
  * match the ISO PNG specification and to avoid relying on the C locale
- * interpretation of character values.
+ * interpretation of character values.  Please keep the list sorted.
  *
  * Notice that PNG_U32 is used to define a 32-bit value for the 4 byte chunk
  * type.  In fact the specification does not express chunk types this way,
@@ -544,21 +544,25 @@
  * In 1.7.0 the definitions were made public in png.h to avoid having to
  * duplicate the same definitions in application code.
  */
-#define png_IHDR PNG_U32( 73,  72,  68,  82)
 #define png_IDAT PNG_U32( 73,  68,  65,  84)
 #define png_IEND PNG_U32( 73,  69,  78,  68)
+#define png_IHDR PNG_U32( 73,  72,  68,  82)
 #define png_PLTE PNG_U32( 80,  76,  84,  69)
 #define png_bKGD PNG_U32( 98,  75,  71,  68)
 #define png_cHRM PNG_U32( 99,  72,  82,  77)
+#define png_fRAc PNG_U32(102,  82,  65,  99) /* registered, not defined */
 #define png_gAMA PNG_U32(103,  65,  77,  65)
+#define png_gIFg PNG_U32(103,  73,  70, 103)
+#define png_gIFt PNG_U32(103,  73,  70, 116) /* deprecated */
+#define png_gIFx PNG_U32(103,  73,  70, 120)
 #define png_hIST PNG_U32(104,  73,  83,  84)
 #define png_iCCP PNG_U32(105,  67,  67,  80)
 #define png_iTXt PNG_U32(105,  84,  88, 116)
 #define png_oFFs PNG_U32(111,  70,  70, 115)
 #define png_pCAL PNG_U32(112,  67,  65,  76)
-#define png_sCAL PNG_U32(115,  67,  65,  76)
 #define png_pHYs PNG_U32(112,  72,  89, 115)
 #define png_sBIT PNG_U32(115,  66,  73,  84)
+#define png_sCAL PNG_U32(115,  67,  65,  76)
 #define png_sPLT PNG_U32(115,  80,  76,  84)
 #define png_sRGB PNG_U32(115,  82,  71,  66)
 #define png_sTER PNG_U32(115,  84,  69,  82)
diff --git a/pngconf.h b/pngconf.h
index d77dbccde..1491b07dd 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.7.0beta16 - June 18, 2013
+ * libpng version 1.7.0beta16 - July 5, 2013
  *
  * Copyright (c) 1998-2013 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index 4a16b8555..559bbddaf 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
 
 VisualStudio instructions
 
-libpng version 1.7.0beta16 - June 18, 2013
+libpng version 1.7.0beta16 - July 5, 2013
 
 Copyright (c) 1998-2010 Glenn Randers-Pehrson
 
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index e94ba4f9a..d170a37b9 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
 <!--
  * zlib.props - location of zlib source
  *
- * libpng version 1.7.0beta16 - June 18, 2013
+ * libpng version 1.7.0beta16 - July 5, 2013
  *
  * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  *
diff --git a/scripts/README.txt b/scripts/README.txt
index c1cfe6950..ed5544e5b 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
 
-Makefiles for  libpng version 1.7.0beta16 - June 18, 2013
+Makefiles for  libpng version 1.7.0beta16 - July 5, 2013
 
 pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.linux    =>  Linux/ELF makefile
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 1cfe56229..ce7034434 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
 
 /* pnglibconf.h - library build configuration */
 
-/* Libpng version 1.7.0beta16 - June 18, 2013 */
+/* Libpng version 1.7.0beta16 - July 5, 2013 */
 
 /* Copyright (c) 1998-2013 Glenn Randers-Pehrson */