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

15 files changed, 39 insertions, 45 deletions

diff --git a/ANNOUNCE b/ANNOUNCE
index 9d5e66fbc..b7b5362cd 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.7.0beta42 - November 7, 2014
+Libpng 1.7.0beta41 - November 7, 2014
 
 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.
@@ -9,20 +9,20 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   1.7.0beta42.tar.xz (LZMA-compressed, recommended)
-   1.7.0beta42.tar.gz
+   1.7.0beta41.tar.xz (LZMA-compressed, recommended)
+   1.7.0beta41.tar.gz
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp170b42.7z  (LZMA-compressed, recommended)
-   lp170b42.zip
+   lp170b41.7z  (LZMA-compressed, recommended)
+   lp170b41.zip
 
 Other information:
 
-   1.7.0beta42-README.txt
-   1.7.0beta42-LICENSE.txt
-   libpng-1.7.0beta42-*.asc (armored detached GPG signatures)
+   1.7.0beta41-README.txt
+   1.7.0beta41-LICENSE.txt
+   libpng-1.7.0beta41-*.asc (armored detached GPG signatures)
 
 Changes since the last public release (1.6.0):
 
@@ -646,9 +646,6 @@ Version 1.7.0beta40 [November 6, 2014]
 Version 1.7.0beta41 [November 7, 2014]
   Added #ifdef PNG_16BIT_SUPPORTED/#endif around png_log16bit() and
     png_do_swap().
-  Changed all "#endif /* PNG_FEATURE_SUPPORTED */" to "#endif /* FEATURE */"
-
-Version 1.7.0beta42 [November 7, 2014]
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 357ea1af5..4a8b9846a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4935,9 +4935,6 @@ Version 1.7.0beta40 [November 6, 2014]
 Version 1.7.0beta41 [November 7, 2014]
   Added #ifdef PNG_16BIT_SUPPORTED/#endif around png_log16bit() and
     png_do_swap().
-  Changed all "#endif /* PNG_FEATURE_SUPPORTED */" to "#endif /* FEATURE */"
-
-Version 1.7.0beta42 [November 7, 2014]
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/LICENSE b/LICENSE
index 61d3bf4fa..a10ed28d6 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.0beta41, November 6, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.7.0beta41, November 7, 2014, are
 Copyright (c) 2004, 2006-2014 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
-November 6, 2014
+November 7, 2014
diff --git a/README b/README
index e918c2d8e..941951f04 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.7.0beta41 - November 6, 2014 (shared library 17.0)
+README for libpng version 1.7.0beta41 - November 7, 2014 (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/libpng-manual.txt b/libpng-manual.txt
index 71279771e..e4cc392aa 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.0beta41 - November 6, 2014
+ libpng version 1.7.0beta41 - November 7, 2014
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2014 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.0beta41 - November 6, 2014
+ libpng versions 0.97, January 1998, through 1.7.0beta41 - November 7, 2014
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2014 Glenn Randers-Pehrson
 
@@ -5309,7 +5309,7 @@ Other rules can be inferred by inspecting the libpng source.
 
 XVII. Y2K Compliance in libpng
 
-November 6, 2014
+November 7, 2014
 
 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 3b24dd17e..5ee05eb4f 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "November 6, 2014"
+.TH LIBPNG 3 "November 7, 2014"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta41
 .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.0beta41 - November 6, 2014
+ libpng version 1.7.0beta41 - November 7, 2014
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2014 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.0beta41 - November 6, 2014
+ libpng versions 0.97, January 1998, through 1.7.0beta41 - November 7, 2014
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2014 Glenn Randers-Pehrson
 
@@ -5803,7 +5803,7 @@ Other rules can be inferred by inspecting the libpng source.
 
 .SH XVII. Y2K Compliance in libpng
 
-November 6, 2014
+November 7, 2014
 
 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
@@ -6073,7 +6073,7 @@ possible without all of you.
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.7.0beta41 - November 6, 2014:
+Libpng version 1.7.0beta41 - November 7, 2014:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
 
@@ -6096,7 +6096,7 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.2.6, August 15, 2004, through 1.7.0beta41, November 6, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.7.0beta41, November 7, 2014, 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
@@ -6195,7 +6195,7 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-November 6, 2014
+November 7, 2014
 
 .\" end of man page
 
diff --git a/libpngpf.3 b/libpngpf.3
index 9ed837d8d..605c4adb5 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "November 6, 2014"
+.TH LIBPNGPF 3 "November 7, 2014"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta41
 (private functions)
diff --git a/png.5 b/png.5
index 0e5a0d40e..0b625f389 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "November 6, 2014"
+.TH PNG 5 "November 7, 2014"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
diff --git a/png.c b/png.c
index bb92cefb7..43b8aacc4 100644
--- a/png.c
+++ b/png.c
@@ -14,7 +14,7 @@
 #include "pngpriv.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_7_0beta42 Your_png_h_is_not_version_1_7_0beta42;
+typedef png_libpng_version_1_7_0beta41 Your_png_h_is_not_version_1_7_0beta41;
 
 /* Tells libpng that we have already handled the first "num_bytes" bytes
  * of the PNG file signature.  If the PNG data is embedded into another
@@ -691,13 +691,13 @@ png_get_copyright(png_const_structrp png_ptr)
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-     "libpng version 1.7.0beta42 - November 7, 2014" PNG_STRING_NEWLINE \
+     "libpng version 1.7.0beta41 - November 7, 2014" PNG_STRING_NEWLINE \
      "Copyright (c) 1998-2014 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.0beta42 - November 7, 2014\
+      return "libpng version 1.7.0beta41 - November 7, 2014\
       Copyright (c) 1998-2014 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 8cbcfc371..5009eb20a 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.7.0beta42 - November 7, 2014
+ * libpng version 1.7.0beta41 - November 7, 2014
  * 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.0beta42 - November 7, 2014: Glenn
+ *   libpng versions 0.97, January 1998, through 1.7.0beta41 - November 7, 2014: 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.0beta42, November 7, 2014, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta41, November 7, 2014, 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:
@@ -318,7 +318,7 @@
  *    an official declaration.
  *
  *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.7.0beta42 are Y2K compliant.  It is my belief that
+ *    upward through 1.7.0beta41 are Y2K compliant.  It is my belief that
  *    earlier versions were also Y2K compliant.
  *
  *    Libpng only has two year fields.  One is a 2-byte unsigned integer
@@ -380,9 +380,9 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.7.0beta42"
+#define PNG_LIBPNG_VER_STRING "1.7.0beta41"
 #define PNG_HEADER_VERSION_STRING \
-     " libpng version 1.7.0beta42 - November 7, 2014\n"
+     " libpng version 1.7.0beta41 - November 7, 2014\n"
 
 #define PNG_LIBPNG_VER_SONUM   17
 #define PNG_LIBPNG_VER_DLLNUM  17
@@ -396,7 +396,7 @@
  * PNG_LIBPNG_VER_STRING, omitting any leading zero:
  */
 
-#define PNG_LIBPNG_VER_BUILD  42
+#define PNG_LIBPNG_VER_BUILD  41
 
 /* Release Status */
 #define PNG_LIBPNG_BUILD_ALPHA    1
@@ -647,7 +647,7 @@ extern "C" {
 /* This triggers a compiler error in png.c, if png.c and png.h
  * do not agree upon the version number.
  */
-typedef char* png_libpng_version_1_7_0beta42;
+typedef char* png_libpng_version_1_7_0beta41;
 
 /* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.
  *
diff --git a/pngconf.h b/pngconf.h
index 77377012b..d8575c822 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.7.0beta42 - November 7, 2014
+ * libpng version 1.7.0beta41 - November 7, 2014
  *
  * 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 dd90ae982..8d7438a92 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
 
 VisualStudio instructions
 
-libpng version 1.7.0beta41 - November 6, 2014
+libpng version 1.7.0beta41 - November 7, 2014
 
 Copyright (c) 1998-2010 Glenn Randers-Pehrson
 
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index eac48d296..c355c1686 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.0beta41 - November 6, 2014
+ * libpng version 1.7.0beta41 - November 7, 2014
  *
  * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  *
diff --git a/scripts/README.txt b/scripts/README.txt
index a95db49b5..fc9a69101 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
 
-Makefiles for  libpng version 1.7.0beta41 - November 6, 2014
+Makefiles for  libpng version 1.7.0beta41 - November 7, 2014
 
 pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.linux    =>  Linux/ELF makefile
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 336cf81b4..7dae9d3aa 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
 
 /* pnglibconf.h - library build configuration */
 
-/* Libpng version 1.7.0beta41 - November 6, 2014 */
+/* Libpng version 1.7.0beta41 - November 7, 2014 */
 
 /* Copyright (c) 1998-2014 Glenn Randers-Pehrson */