[libpng16] Imported from libpng-1.6.0beta05.tar

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.6.0beta05, December 30, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.0beta05, January 15, 2012, are
 Copyright (c) 2004, 2006-2011 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
-December 30, 2011
+January 15, 2012

README

-README for libpng version 1.6.0beta05 - December 30, 2011 (shared library 16.0)
+README for libpng version 1.6.0beta05 - January 15, 2012 (shared library 16.0)
 See the note about version numbers near the top of png.h
 
 See INSTALL for instructions on how to install libpng.

contrib/pngminus/pnm2png.c

@@ -524,7 +524,7 @@ png_uint_32 get_value (FILE *pnm_file, int depth)
 {
   static png_uint_32 mask = 0;
   png_byte token[16];
-  unsigned long ulret_value;
+  unsigned long ul_ret_value;
   png_uint_32 ret_value;
   int i = 0;
 
@@ -533,8 +533,8 @@ png_uint_32 get_value (FILE *pnm_file, int depth)
       mask = (mask << 1) | 0x01;
 
   get_token (pnm_file, (char *) token);
-  sscanf ((const char *) token, "%lu", &ulret_value);
-  ret_value = (png_uint_32) ulret_value;
+  sscanf ((const char *) token, "%lu", &ul_ret_value);
+  ret_value = (png_uint_32) ul_ret_value;
 
   ret_value &= mask;
 

contrib/tools/cvtcolor.c

@@ -3,7 +3,7 @@
  *
  * Last changed in libpng 1.6.0 [(PENDING RELEASE)]
  *
- * COPYRIGHT: Written by John Cunningham Bowler, 2011.
+ * COPYRIGHT: Written by John Cunningham Bowler, 2012.
  * To the extent possible under law, the author has waived all copyright and
  * related or neighboring rights to this work.  This work is published from:
  * United States.

contrib/tools/intgamma.sh

@@ -4,7 +4,7 @@
 #
 # Last changed in libpng 1.6.0 [(PENDING RELEASE)]
 #
-# COPYRIGHT: Written by John Cunningham Bowler, 2011.
+# COPYRIGHT: Written by John Cunningham Bowler, 2012.
 # To the extent possible under law, the author has waived all copyright and
 # related or neighboring rights to this work.  This work is published from:
 # United States.

contrib/tools/makesRGB.c

@@ -2,7 +2,7 @@
  *
  * Last changed in libpng 1.6.0 [(PENDING RELEASE)]
  *
- * COPYRIGHT: Written by John Cunningham Bowler, 2011.
+ * COPYRIGHT: Written by John Cunningham Bowler, 2012.
  * To the extent possible under law, the author has waived all copyright and
  * related or neighboring rights to this work.  This work is published from:
  * United States.

contrib/tools/sRGB.h

@@ -3,7 +3,7 @@
  *
  * Last changed in libpng 1.6.0 [(PENDING RELEASE)]
  *
- * COPYRIGHT: Written by John Cunningham Bowler, 2011.
+ * COPYRIGHT: Written by John Cunningham Bowler, 2012.
  * To the extent possible under law, the author has waived all copyright and
  * related or neighboring rights to this work.  This work is published from:
  * United States.

libpng-manual.txt

 libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.6.0beta05 - January 11, 2012
+ libpng version 1.6.0beta05 - January 15, 2012
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2011 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.6.0beta05 - January 11, 2012
+ libpng versions 0.97, January 1998, through 1.6.0beta05 - January 15, 2012
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2011 Glenn Randers-Pehrson
 
@@ -4905,7 +4905,7 @@ Other rules can be inferred by inspecting the libpng source.
 
 XVI. Y2K Compliance in libpng
 
-January 11, 2012
+January 15, 2012
 
 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.

libpngpf.3

-.TH LIBPNGPF 3 "December 30, 2011"
+.TH LIBPNGPF 3 "January 15, 2012"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta05
 (private functions)

png.5

-.TH PNG 5 "December 30, 2011"
+.TH PNG 5 "January 15, 2012"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION

png.c

@@ -762,13 +762,13 @@ png_get_copyright(png_const_structrp png_ptr)
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-     "libpng version 1.6.0beta05 - January 1, 2012" PNG_STRING_NEWLINE \
+     "libpng version 1.6.0beta05 - January 15, 2012" PNG_STRING_NEWLINE \
      "Copyright (c) 1998-2012 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.6.0beta05 - January 1, 2012\
+      return "libpng version 1.6.0beta05 - January 15, 2012\
       Copyright (c) 1998-2012 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";

png.h

 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.6.0beta05 - January 1, 2012
+ * libpng version 1.6.0beta05 - January 15, 2012
  * Copyright (c) 1998-2012 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.0beta05 - January 1, 2012: Glenn
+ *   libpng versions 0.97, January 1998, through 1.6.0beta05 - January 15, 2012: Glenn
  *   See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -198,7 +198,7 @@
  *
  * This code is released under the libpng license.
  *
- * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta05, January 1, 2012, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta05, January 15, 2012, are
  * Copyright (c) 2004, 2006-2012 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:
@@ -310,7 +310,7 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    January 1, 2012
+ *    January 15, 2012
  *
  *    Since the PNG Development group is an ad-hoc body, we can't make
  *    an official declaration.
@@ -376,7 +376,7 @@
 /* Version information for png.h - this should match the version in png.c */
 #define PNG_LIBPNG_VER_STRING "1.6.0beta05"
 #define PNG_HEADER_VERSION_STRING \
-     " libpng version 1.6.0beta05 - January 1, 2012\n"
+     " libpng version 1.6.0beta05 - January 15, 2012\n"
 
 #define PNG_LIBPNG_VER_SONUM   16
 #define PNG_LIBPNG_VER_DLLNUM  16

pngconf.h

 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.6.0beta05 - January 1, 2012
+ * libpng version 1.6.0beta05 - January 15, 2012
  *
  * Copyright (c) 1998-2012 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

pngerror.c

@@ -346,9 +346,9 @@ png_formatted_warning(png_const_structrp png_ptr, png_warning_parameters p,
    /* i is always less than (sizeof msg), so: */
    msg[i] = '\0';
 
-   /* And this is the formatted message, it may be larger than
-    * PNG_MAX_ERROR_TEXT, but that is only used for 'chunk' errors and these are
-    * not (currently) formatted.
+   /* And this is the formatted message. It may be larger than
+    * PNG_MAX_ERROR_TEXT, but that is only used for 'chunk' errors and these
+    * are not (currently) formatted.
     */
    png_warning(png_ptr, msg);
 }

projects/vstudio/readme.txt

 
 VisualStudio instructions
 
-libpng version 1.6.0beta05 - December 30, 2011
+libpng version 1.6.0beta05 - January 15, 2012
 
 Copyright (c) 1998-2010 Glenn Randers-Pehrson
 

projects/vstudio/zlib.props

@@ -2,7 +2,7 @@
 <!--
  * zlib.props - location of zlib source
  *
- * libpng version 1.6.0beta05 - December 30, 2011
+ * libpng version 1.6.0beta05 - January 15, 2012
  *
  * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  *

scripts/README.txt

 
-Makefiles for  libpng version 1.6.0beta05 - December 30, 2011
+Makefiles for  libpng version 1.6.0beta05 - January 15, 2012
 
 pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.linux    =>  Linux/ELF makefile

scripts/pnglibconf.h.prebuilt

@@ -3,7 +3,7 @@
 
 /* pnglibconf.h - library build configuration */
 
-/* Libpng 1.6.0beta05 - January 1, 2012 */
+/* Libpng 1.6.0beta05 - January 15, 2012 */
 
 /* Copyright (c) 1998-2012 Glenn Randers-Pehrson */