--amend [devel] Imported from libpng-1.5.1.tarv1.5.1

34 files changed, 96 insertions, 126 deletions

diff --git a/ANNOUNCE b/ANNOUNCE
index 4069e20f0..4a3b01888 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,76 +1,56 @@
 
-Libpng 1.5.1rc02 - January 31, 2011
+Libpng 1.5.1 - February 3, 2011
 
-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.
+This is a public release of libpng, intended for use in production codes.
 
 Files available for download:
 
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   1.5.1rc02.tar.xz (LZMA-compressed, recommended)
-   1.5.1rc02.tar.gz
-   1.5.1rc02.tar.bz2
+   libpng-1.5.1.tar.xz (LZMA-compressed, recommended)
+   libpng-1.5.1.tar.gz
+   libpng-1.5.1.tar.bz2
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp151r02.7z  (LZMA-compressed, recommended)
-   lp151r02.zip
+   lpng151.7z  (LZMA-compressed, recommended)
+   lpng151.zip
 
 Other information:
 
-   1.5.1rc02-README.txt
-   1.5.1rc02-LICENSE.txt
+   libpng-1.5.1-README.txt
+   libpng-1.5.1-LICENSE.txt
 
 Changes since the last public release (1.5.0):
 
-version 1.5.1beta01 [January 8, 2011]
   Added description of png_set_crc_action() to the manual.
   Added a note in the manual that the type of the iCCP profile was changed
-    from png_charpp to png_bytepp in png_get_iCCP().  This change happened
-    in version 1.5.0beta36 but is not noted in the CHANGES.  Similarly,
+    from png_charpp to png_bytepp in png_get_iCCP().  Similarly,
     it was changed from png_charpp to png_const_bytepp in png_set_iCCP().
   Ensure that png_rgb_to_gray ignores palette mapped images, if libpng
     internally happens to call it with one.
   Fixed the failure to handle palette mapped images correctly.
-
-Version 1.5.1beta02 [January 14, 2011]
   Fixed a bug in handling of interlaced images (bero at arklinux.org).
   Updated CMakeLists.txt (Clifford Yapp)
-
-Version 1.5.1beta03 [January 14, 2011]
   Fixed typecasting of some png_debug() statements (Cosmin)
-
-Version 1.5.1beta04 [January 16, 2011]
   Updated documentation of png_set|get_tRNS() (Thomas Klausner).
   Mentioned in the documentation that applications must #include "zlib.h"
     if they need access to anything in zlib.h, and that a number of
     macros such as png_memset() are no longer accessible by applications.
   Corrected pngvalid gamma test "sample" function to access all of the color
     samples of each pixel, instead of sampling the red channel three times.
-  Prefixed variable names index, div, exp, gamma with "png_" to avoid "shadow"
-    warnings.
-
-Version 1.5.1beta05 [January 16, 2011]
-  Changed variable names png_index, png_div, png_exp, and png_gamma to
-    char_index, divisor, exp_b10, and gamma_val, respectively, and
-    changed exp() back to png_exp().
-
-Version 1.5.1beta06 [January 20, 2011]
+  Changed variable names index, div, exp, and gamma to char_index, divisor,
+    exp_b10, and gamma_val, respectively, to avoid "shadow" warnings.
   Prevent png_push_crc_skip() from hanging while reading an unknown chunk
     or an over-large compressed zTXt chunk with the progressive reader.
   Eliminated more GCC "shadow" warnings.
   Revised png_fixed() in png.c to avoid compiler warning about reaching the
     end without returning anything.
-
-Version 1.5.1beta07 [January 22, 2011]
   In the manual, describe the png_get_IHDR() arguments in the correct order.
   Added const_png_structp and const_png_infop types, and used them in
     prototypes for most png_get_*() functions.
-
-Version 1.5.1beta08 [January 23, 2011]
   Added png_get_io_chunk_type() and deprecated png_get_io_chunk_name()
   Added synopses for the IO_STATE functions and other missing synopses
     to the manual. Removed the synopses from libpngpf.3 because they
@@ -86,8 +66,6 @@ Version 1.5.1beta08 [January 23, 2011]
   Added png_process_data_pause and png_process_data_skip for the benefit of
     progressive readers that need to stop data processing or want to optimize
     skipping of unread data (e.g. if the reader marks a chunk to be skipped.)
-
-Version 1.5.1beta09 [January 24, 2011]
   Enhanced pngvalid, corrected an error in gray_to_rgb, corrected doc error.
     pngvalid contains tests of transforms, which tests are currently disabled
     because they are incompletely tested.  gray_to_rgb was failing to expand
@@ -95,8 +73,6 @@ Version 1.5.1beta09 [January 24, 2011]
     standing error and resulted, apparently, in invalid output.  The
     documentation did not accurately describe what libpng really does when
     converting RGB to gray.
-
-Version 1.5.1beta10 [January 27, 2010]
   Fixed incorrect examples of callback prototypes in the manual, that were
     introduced in libpng-1.0.0.
   In addition the order of the png_get_uint macros with respect to the
@@ -107,23 +83,12 @@ Version 1.5.1beta10 [January 27, 2010]
     the read macros interfering with the symbol file format.
   Made the manual, synopses, and function prototypes use the function
     argument names file_gamma, int_file_gamma, and srgb_intent consistently.
-
-Version 1.5.1beta11 [January 28, 2011]
-  Changed PNG_UNUSED from "param=param;" to "{if(param){}}".
-  Corrected local variable type in new API png_process_data_skip()
-    The type was self-evidently incorrect but only causes problems on 64 bit
-    architectures.
+  Changed PNG_UNUSED from "param=param;" to "(void)param;".
   Added transform tests to pngvalid and simplified the arguments.
-
-Version 1.5.1rc01 [January 31, 2011]
-  No changes.
-
-Version 1.5.1rc02 [January 31, 2011]
   Added a request in the manual that applications do not use "png_" or
     "PNG_" to begin any of their own symbols.
-  Changed PNG_UNUSED to "(void)param;" and updated the commentary in pngpriv.h
 
-Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
+Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
 to subscribe) or to glennrp at users.sourceforge.net
diff --git a/CHANGES b/CHANGES
index 121e517f4..fa5f2aae7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3231,7 +3231,7 @@ Version 1.5.1beta11 [January 28, 2011]
     architectures.
   Added transform tests to pngvalid and simplified the arguments.
 
-Version 1.5.1rc01 [January 31, 2011]
+Version 1.5.1rc01 [January 29, 2011]
   No changes.
 
 Version 1.5.1rc02 [January 31, 2011]
@@ -3239,6 +3239,9 @@ Version 1.5.1rc02 [January 31, 2011]
     "PNG_" to begin any of their own symbols.
   Changed PNG_UNUSED to "(void)param;" and updated the commentary in pngpriv.h
 
+Version 1.5.1 [February 3, 2011]
+  No changes.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c12dd7684..2ee5bf338 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -264,7 +264,7 @@ install(CODE ${PNG_CONFIG_INSTALL_CODE})
 # SET UP LINKS
 if(PNG_SHARED)
   set_target_properties(${PNG_LIB_NAME} PROPERTIES
-#   VERSION 15.${PNGLIB_RELEASE}.1.5.1rc02
+#   VERSION 15.${PNGLIB_RELEASE}.1.5.1
     VERSION 15.${PNGLIB_RELEASE}.0
     SOVERSION 15
     CLEAN_DIRECT_OUTPUT 1)
diff --git a/LICENSE b/LICENSE
index 2eade7c8e..b28f15c74 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.5.1rc02, January 31, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.1, February 3, 2011, 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
-January 31, 2011
+February 3, 2011
diff --git a/README b/README
index 686e758f2..9dd6745f0 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.5.1rc02 - January 31, 2011 (shared library 15.0)
+README for libpng version 1.5.1 - February 3, 2011 (shared library 15.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/configure b/configure
index 598ae4524..1f5ad9216 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libpng 1.5.1rc02.
+# Generated by GNU Autoconf 2.68 for libpng 1.5.1.
 #
 # Report bugs to <png-mng-implement@lists.sourceforge.net>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libpng'
 PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.5.1rc02'
-PACKAGE_STRING='libpng 1.5.1rc02'
+PACKAGE_VERSION='1.5.1'
+PACKAGE_STRING='libpng 1.5.1'
 PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -1307,7 +1307,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libpng 1.5.1rc02 to adapt to many kinds of systems.
+\`configure' configures libpng 1.5.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1377,7 +1377,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libpng 1.5.1rc02:";;
+     short | recursive ) echo "Configuration of libpng 1.5.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1485,7 +1485,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libpng configure 1.5.1rc02
+libpng configure 1.5.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1908,7 +1908,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libpng $as_me 1.5.1rc02, which was
+It was created by libpng $as_me 1.5.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2723,7 +2723,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libpng'
- VERSION='1.5.1rc02'
+ VERSION='1.5.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2787,7 +2787,7 @@ fi
 
 
 
-PNGLIB_VERSION=1.5.1rc02
+PNGLIB_VERSION=1.5.1
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=5
 PNGLIB_RELEASE=1
@@ -13040,7 +13040,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libpng $as_me 1.5.1rc02, which was
+This file was extended by libpng $as_me 1.5.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13106,7 +13106,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libpng config.status 1.5.1rc02
+libpng config.status 1.5.1
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 4a61600f6..ff277a4d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@ AC_PREREQ(2.59)
 
 dnl Version number stuff here:
 
-AC_INIT([libpng], [1.5.1rc02], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.5.1], [png-mng-implement@lists.sourceforge.net])
 AM_INIT_AUTOMAKE
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE
 
-PNGLIB_VERSION=1.5.1rc02
+PNGLIB_VERSION=1.5.1
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=5
 PNGLIB_RELEASE=1
diff --git a/libpng-manual.txt b/libpng-manual.txt
index 84f657c84..77adf7aec 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.5.1rc02 - January 31, 2011
+ libpng version 1.5.1 - February 3, 2011
  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.5.1rc02 - January 31, 2011
+ libpng versions 0.97, January 1998, through 1.5.1 - February 3, 2011
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2011 Glenn Randers-Pehrson
 
@@ -1175,7 +1175,7 @@ things.
 As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was
 added.  It expands the sample depth without changing tRNS to alpha.
 
-As of libpng version 1.5.1rc02, not all possible expansions are supported.
+As of libpng version 1.5.1, not all possible expansions are supported.
 
 In the following table, the 01 means grayscale with depth<8, 31 means
 indexed with depth<8, other numerals represent the color type, "T" means
@@ -4081,13 +4081,13 @@ Other rules can be inferred by inspecting the libpng source.
 
 XIV. Y2K Compliance in libpng
 
-January 31, 2011
+February 3, 2011
 
 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
 
 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.5.1rc02 are Y2K compliant.  It is my belief that earlier
+upward through 1.5.1 are Y2K compliant.  It is my belief that earlier
 versions were also Y2K compliant.
 
 Libpng only has three year fields.  One is a 2-byte unsigned integer that
diff --git a/libpng.3 b/libpng.3
index 03a97e837..ecc42777b 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "January 31, 2011"
+.TH LIBPNG 3 "February 3, 2011"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.5.1rc02
+libpng \- Portable Network Graphics (PNG) Reference Library 1.5.1
 .SH SYNOPSIS
 \fI\fB
 
@@ -919,7 +919,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.5.1rc02 - January 31, 2011
+ libpng version 1.5.1 - February 3, 2011
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2011 Glenn Randers-Pehrson
@@ -930,7 +930,7 @@ libpng-manual.txt - A description on how to use and modify libpng
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.5.1rc02 - January 31, 2011
+ libpng versions 0.97, January 1998, through 1.5.1 - February 3, 2011
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2011 Glenn Randers-Pehrson
 
@@ -2094,7 +2094,7 @@ things.
 As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was
 added.  It expands the sample depth without changing tRNS to alpha.
 
-As of libpng version 1.5.1rc02, not all possible expansions are supported.
+As of libpng version 1.5.1, not all possible expansions are supported.
 
 In the following table, the 01 means grayscale with depth<8, 31 means
 indexed with depth<8, other numerals represent the color type, "T" means
@@ -5000,13 +5000,13 @@ Other rules can be inferred by inspecting the libpng source.
 
 .SH XIV. Y2K Compliance in libpng
 
-January 31, 2011
+February 3, 2011
 
 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
 
 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.5.1rc02 are Y2K compliant.  It is my belief that earlier
+upward through 1.5.1 are Y2K compliant.  It is my belief that earlier
 versions were also Y2K compliant.
 
 Libpng only has three year fields.  One is a 2-byte unsigned integer that
@@ -5190,7 +5190,8 @@ the first widely used release:
  1.5.0rc01-07        15    10500  15.so.15.0[.0]
  1.5.0               15    10500  15.so.15.0[.0]
  1.5.1beta01-11      15    10501  15.so.15.1[.0]
- 1.5.1rc01           15    10501  15.so.15.1[.0]
+ 1.5.1rc01-02        15    10501  15.so.15.1[.0]
+ 1.5.1               15    10501  15.so.15.1[.0]
 
 Henceforth the source version will match the shared-library minor
 and patch numbers; the shared-library major version number will be
@@ -5247,7 +5248,7 @@ possible without all of you.
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.5.1rc02 - January 31, 2011:
+Libpng version 1.5.1 - February 3, 2011:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
 
@@ -5270,7 +5271,7 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.2.6, August 15, 2004, through 1.5.1rc02, January 31, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.1, February 3, 2011, 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
@@ -5369,7 +5370,7 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-January 31, 2011
+February 3, 2011
 
 .\" end of man page
 
diff --git a/libpngpf.3 b/libpngpf.3
index ac95aa01d..ff6e1641e 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "January 31, 2011"
+.TH LIBPNGPF 3 "February 3, 2011"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.5.1rc02
+libpng \- Portable Network Graphics (PNG) Reference Library 1.5.1
 (private functions)
 .SH SYNOPSIS
 \fB#include \fI"pngpriv.h"
diff --git a/png.5 b/png.5
index 14e1ea380..9c5f8d336 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "January 31, 2011"
+.TH PNG 5 "February 3, 2011"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
diff --git a/png.c b/png.c
index 70ee6f687..764f47c20 100644
--- a/png.c
+++ b/png.c
@@ -1,7 +1,7 @@
 
 /* png.c - location for general purpose libpng functions
  *
- * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.1 [February 3, 2011]
  * Copyright (c) 1998-2011 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.)
@@ -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_5_1rc02 Your_png_h_is_not_version_1_5_1rc02;
+typedef png_libpng_version_1_5_1 Your_png_h_is_not_version_1_5_1;
 
 /* 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
@@ -555,13 +555,13 @@ png_get_copyright(png_const_structp png_ptr)
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-     "libpng version 1.5.1rc02 - January 31, 2011" PNG_STRING_NEWLINE \
+     "libpng version 1.5.1 - February 3, 2011" PNG_STRING_NEWLINE \
      "Copyright (c) 1998-2011 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.5.1rc02 - January 31, 2011\
+      return "libpng version 1.5.1 - February 3, 2011\
       Copyright (c) 1998-2011 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 6768b9196..100f56dba 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.5.1rc02 - January 31, 2011
+ * libpng version 1.5.1 - February 3, 2011
  * Copyright (c) 1998-2011 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.5.1rc02 - January 31, 2011: Glenn
+ *   libpng versions 0.97, January 1998, through 1.5.1 - February 3, 2011: Glenn
  *   See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -145,7 +145,8 @@
  *    1.5.0rc01-07            15    10500  15.so.15.0[.0]
  *    1.5.0                   15    10500  15.so.15.0[.0]
  *    1.5.1beta01-11          15    10501  15.so.15.1[.0]
- *    1.5.1rc01               15    10501  15.so.15.1[.0]
+ *    1.5.1rc01-02            15    10501  15.so.15.1[.0]
+ *    1.5.1                   15    10501  15.so.15.1[.0]
  *
  *   Henceforth the source version will match the shared-library major
  *   and minor numbers; the shared-library major version number will be
@@ -177,7 +178,7 @@
  *
  * This code is released under the libpng license.
  *
- * libpng versions 1.2.6, August 15, 2004, through 1.5.1rc02, January 31, 2011, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.5.1, February 3, 2011, 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:
@@ -289,13 +290,13 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    January 31, 2011
+ *    February 3, 2011
  *
  *    Since the PNG Development group is an ad-hoc body, we can't make
  *    an official declaration.
  *
  *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.5.1rc02 are Y2K compliant.  It is my belief that
+ *    upward through 1.5.1 are Y2K compliant.  It is my belief that
  *    earlier versions were also Y2K compliant.
  *
  *    Libpng only has three year fields.  One is a 2-byte unsigned integer
@@ -351,9 +352,9 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.5.1rc02"
+#define PNG_LIBPNG_VER_STRING "1.5.1"
 #define PNG_HEADER_VERSION_STRING \
-     " libpng version 1.5.1rc02 - January 31, 2011\n"
+     " libpng version 1.5.1 - February 3, 2011\n"
 
 #define PNG_LIBPNG_VER_SONUM   15
 #define PNG_LIBPNG_VER_DLLNUM  15
@@ -366,7 +367,7 @@
  * PNG_LIBPNG_VER_STRING, omitting any leading zero:
  */
 
-#define PNG_LIBPNG_VER_BUILD  02
+#define PNG_LIBPNG_VER_BUILD  0
 
 /* Release Status */
 #define PNG_LIBPNG_BUILD_ALPHA    1
@@ -508,7 +509,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_5_1rc02;
+typedef char* png_libpng_version_1_5_1;
 
 /* Three color definitions.  The order of the red, green, and blue, (and the
  * exact size) is not important, although the size of the fields need to
diff --git a/pngconf.h b/pngconf.h
index ccb1c659f..2633bf890 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.5.1rc02 - (PENDING RELEASE)
+ * libpng version 1.5.1 - February 3, 2011
  *
  * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngerror.c b/pngerror.c
index b4b3739c3..8290bb410 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -1,7 +1,7 @@
 
 /* pngerror.c - stub functions for i/o and memory allocation
  *
- * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.1 [February 3, 2011]
  * Copyright (c) 1998-2011 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.)
diff --git a/pngget.c b/pngget.c
index 2af90f9c7..b5e5798c0 100644
--- a/pngget.c
+++ b/pngget.c
@@ -1,7 +1,7 @@
 
 /* pngget.c - retrieval of values from info struct
  *
- * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.1 [February 3, 2011]
  * Copyright (c) 1998-2011 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.)
diff --git a/pngmem.c b/pngmem.c
index 83e24251a..a15d8b085 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,7 +1,7 @@
 
 /* pngmem.c - stub functions for memory allocation
  *
- * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.1 [February 3, 2011]
  * Copyright (c) 1998-2011 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.)
diff --git a/pngpread.c b/pngpread.c
index dbd97068c..7b1149bab 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,7 +1,7 @@
 
 /* pngpread.c - read a png file in push mode
  *
- * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.1 [February 3, 2011]
  * Copyright (c) 1998-2011 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.)
diff --git a/pngrtran.c b/pngrtran.c
index 602affb54..e6e0c46b4 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1,7 +1,7 @@
 
 /* pngrtran.c - transforms the data in a row for PNG readers
  *
- * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.1 [February 3, 2011]
  * Copyright (c) 1998-2011 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.)
diff --git a/pngrutil.c b/pngrutil.c
index b88124c9b..4c3cd5381 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@
 
 /* pngrutil.c - utilities to read a PNG file
  *
- * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.1 [February 3, 2011]
  * Copyright (c) 1998-2011 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.)
diff --git a/pngset.c b/pngset.c
index f8df29a39..2cfcf33bd 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
 
 /* pngset.c - storage of image information into info struct
  *
- * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.1 [February 3, 2011]
  * Copyright (c) 1998-2011 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.)
diff --git a/pngtest.c b/pngtest.c
index 26edb38db..cbb7eb276 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1784,4 +1784,4 @@ main(int argc, char *argv[])
 }
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_5_1rc02 Your_png_h_is_not_version_1_5_1rc02;
+typedef png_libpng_version_1_5_1 Your_png_h_is_not_version_1_5_1;
diff --git a/pngtrans.c b/pngtrans.c
index 4515ea668..137f555a6 100644
--- a/pngtrans.c
+++ b/pngtrans.c
@@ -1,7 +1,7 @@
 
 /* pngtrans.c - transforms the data in a row (used by both readers and writers)
  *
- * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.1 [February 3, 2011]
  * Copyright (c) 1998-2011 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.)
diff --git a/pngvalid.c b/pngvalid.c
index 7b34af54a..faebe4b8b 100644
--- a/pngvalid.c
+++ b/pngvalid.c
@@ -1,7 +1,7 @@
 
 /* pngvalid.c - validate libpng by constructing then reading png files.
  *
- * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.1 [February 3, 2011]
  * Copyright (c) 2011 Glenn Randers-Pehrson
  * Written by John Cunningham Bowler
  *
diff --git a/pngwrite.c b/pngwrite.c
index a276d7c31..d90f449e3 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,7 +1,7 @@
 
 /* pngwrite.c - general routines to write a PNG file
  *
- * Last changed in libpng 1.5.1 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.1 [February 3, 2011]
  * Copyright (c) 1998-2011 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.)
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index 6db5b754c..8f3daef9d 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
 
 VisualStudio instructions
 
-libpng version 1.5.1rc02 - January 31, 2011
+libpng version 1.5.1 - February 3, 2011
 
 Copyright (c) 1998-2010 Glenn Randers-Pehrson
 
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index e0e6aa286..44cf64ecf 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
 <!--
  * zlib.props - location of zlib source
  *
- * libpng version 1.5.1rc02 - January 31, 2011
+ * libpng version 1.5.1 - February 3, 2011
  *
  * Copyright (c) 1998-2010 Glenn Randers-Pehrson
  *
diff --git a/scripts/README.txt b/scripts/README.txt
index 061a70590..a427f8e9f 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,9 +1,9 @@
 
-Makefiles for  libpng version 1.5.1rc02 - January 31, 2011
+Makefiles for  libpng version 1.5.1 - February 3, 2011
 
 pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.linux    =>  Linux/ELF makefile
-                       (gcc, creates libpng15.so.15.1.5.1rc02)
+                       (gcc, creates libpng15.so.15.1.5.1)
  makefile.gcc      =>  Generic makefile (gcc, creates static libpng.a)
  makefile.knr      =>  Archaic UNIX Makefile that converts files with
                        ansi2knr (Requires ansi2knr.c from
@@ -20,7 +20,7 @@ pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.dec      =>  DEC Alpha UNIX makefile
  makefile.dj2      =>  DJGPP 2 makefile
  makefile.elf      =>  Linux/ELF makefile symbol versioning,
-                       (gcc, creates libpng15.so.15.1.5.1rc02)
+                       (gcc, creates libpng15.so.15.1.5.1)
  makefile.freebsd  =>  FreeBSD makefile
  makefile.gcc      =>  Generic gcc makefile
  makefile.hpgcc    =>  HPUX makefile using gcc
@@ -35,12 +35,12 @@ pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.os2      =>  OS/2 Makefile (gcc and emx, requires libpng.def)
  makefile.sco      =>  For SCO OSr5  ELF and Unixware 7 with Native cc
  makefile.sggcc    =>  Silicon Graphics (gcc,
-                       creates libpng15.so.15.1.5.1rc02)
+                       creates libpng15.so.15.1.5.1)
  makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
  makefile.solaris  =>  Solaris 2.X makefile (gcc,
-                       creates libpng15.so.15.1.5.1rc02)
+                       creates libpng15.so.15.1.5.1)
  makefile.so9      =>  Solaris 9 makefile (gcc,
-                       creates libpng15.so.15.1.5.1rc02)
+                       creates libpng15.so.15.1.5.1)
  makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
  makefile.sunos    =>  Sun makefile
  makefile.32sunu   =>  Sun Ultra 32-bit makefile
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index b47966152..d11f524bf 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@
 
 # Modeled after libxml-config.
 
-version=1.5.1rc02
+version=1.5.1
 prefix=""
 libdir=""
 libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 007017241..0e76f9b00 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng15
 
 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.5.1rc02
+Version: 1.5.1
 Libs: -L${libdir} -lpng15
 Cflags: -I${includedir}
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 8fe8b96e7..79889153b 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng15
 
 LIB=	png15
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.5.1rc02
+SHLIB_MINOR=	1.5.1
 SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 	pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index dd45ff9a5..fc98579e6 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
 
 LIB=	png
 SHLIB_MAJOR=	15
-SHLIB_MINOR=	1.5.1rc02
+SHLIB_MINOR=	1.5.1
 SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 	pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index fe211bd3f..196cd0f88 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -11,7 +11,7 @@ LIBDIR=	${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat
 
 SHLIB_MAJOR=	15
-SHLIB_MINOR=	1.5.1rc02
+SHLIB_MINOR=	1.5.1
 
 LIB=	png
 SRCS=	png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/symbols.def b/scripts/symbols.def
index 1c0eb5cca..fac338696 100644
--- a/scripts/symbols.def
+++ b/scripts/symbols.def
@@ -5,7 +5,7 @@
 LIBRARY
 
 EXPORTS
-;Version 1.5.1rc02
+;Version 1.5.1
  png_access_version_number @1
  png_set_sig_bytes @2
  png_sig_cmp @3