[master] Imported from libpng-1.4.5.tarv1.4.5

28 files changed, 92 insertions, 123 deletions

diff --git a/ANNOUNCE b/ANNOUNCE
index 752a92716..dfcfcb65a 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,66 +1,40 @@
 
-Libpng 1.4.5rc04 - December 9, 2010
+Libpng 1.4.5 - December 9, 2010
 
-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.4.5rc04.tar.xz (LZMA-compressed, recommended)
-   1.4.5rc04.tar.gz
-   1.4.5rc04.tar.bz2
+   libpng-1.4.5.tar.xz (LZMA-compressed, recommended)
+   libpng-1.4.5.tar.gz
+   libpng-1.4.5.tar.bz2
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp145r04.zip
-   lp145r04.7z
+   lpng145.zip
+   lpng145.7z
 
 Other information:
 
-   1.4.5rc04-README.txt
-   1.4.5rc04-LICENSE.txt
+   libpng-1.4.5-README.txt
+   libpng-1.4.5-LICENSE.txt
 
 Changes since the last public release (1.4.4):
 
-version 1.4.5beta01 [September 25, 2010]
-  Fixed possible configure.ac bug introduced in version 1.4.4rc05.
-  Rebuilt configure scripts with autoconf-2.68 instead of autoconf-2.65
-
-version 1.4.5beta02 [October 5, 2010]
-  Reverted configure scripts to autoconf-2.65
-  Fixed problem with symbols creation in Makefile.am which was assuming that
-    all versions of cpp write to standard output by default (Martin Banky). The
-    bug was introduced in libpng-1.2.9beta5.
-
-version 1.4.5beta03 [October 8, 2010]
+  Fixed possible configure.ac bug introduced in version 1.4.4.
   Wrapped long lines in CMakeLists.txt and introduced ${libpng_public_hdrs}
-  Undid Makefile.am revision of 1.4.5beta02.
-
-version 1.4.5beta04 [November 8, 2010]
   Check for out-of-range text compression mode in png_set_text().
-
-version 1.4.5rc01 [November 19, 2010]
-  No changes.
-
-version 1.4.5beta05 [December 9, 2010]
   Removed some extraneous parentheses that appeared in pngrutil.c of
-    libpng-1.4.3beta01
+    libpng-1.4.3
   Revised png_get_uint_32, png_get_int_32, png_get_uint_16 (Cosmin)
   Moved reading of file signature into png_read_sig (Cosmin)
   Fixed atomicity of chunk header serialization (Cosmin)
   Added test for io_state in pngtest.c (Cosmin)
   Added "#!/bin/sh" at the top of contrib/pngminim/*/gather.sh scripts.
-
-version 1.4.5beta06 [November 21, 2010]
-  Restored the parentheses in pngrutil.c; they are needed when the
-    png_get_*int_*() functions are compiled (i.e., when PNG_USE_READ_MACROS
-    is not defined).
-  Make the "png_get_uint_16" macro return a png_uint_32 in libpng-1.4 for API
-    compatibility.
   Changes to remove gcc warnings (John Bowler)
     Certain optional gcc warning flags resulted in warnings in libpng code.
     With these changes only -Wconversion and -Wcast-qual cannot be turned on.
@@ -69,16 +43,9 @@ version 1.4.5beta06 [November 21, 2010]
     smaller than (int) or (unsigned int)) and -Wcast-qual is not possible
     with pngwio.c and pngwutil.c because the 'write' callback and zlib
     compression both fail to declare their input buffers with 'const'.
-
-version 1.4.5beta07 [November 25, 2010]
-  Reverted png_get_uint_16 macro to beta05 and added comment about the
-    potential API incompatibility.
-
-version 1.4.5rc02 [December 2, 2010]
-  No changes.
-
-version 1.4.5rc03 [December 9, 2010]
-  Added missing vstudio/*/*.vcxproj files to the zip and 7z distributions.
+  Added comment about the potential API incompatibility of the
+    png_get_uint_16() macro with libpng-1.4.0 through 1.4.4.
+  Removed PNG_NO_WRITE_GAMMA from pngminim/encoder/pngusr.h
 
 Send comments/corrections/commendations to glennrp at users.sourceforge.net
 or to png-mng-implement at lists.sf.net (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 369b04b5c..b3880896d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2729,10 +2729,10 @@ version 1.4.5beta07 [November 25, 2010]
 version 1.4.5rc02 [December 2, 2010]
   No changes.
 
-version 1.4.5rc03 [December 9, 2010]
+version 1.4.5rc03 [December 3, 2010]
   Added missing vstudio/*/*.vcxproj files to the zip and 7z distributions.
 
-version 1.4.5rc03-cos [December 8, 2010]
+version 1.4.5 [December 9, 2010]
   Removed PNG_NO_WRITE_GAMMA from pngminim/encoder/pngusr.h
 
 Send comments/corrections/commendations to glennrp at users.sourceforge.net
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f2d7cc5a..24a38c4f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -252,7 +252,7 @@ install(CODE ${PNG_CONFIG_INSTALL_CODE})
 # SET UP LINKS
 if(PNG_SHARED)
   set_target_properties(${PNG_LIB_NAME} PROPERTIES
-#   VERSION 14.${PNGLIB_RELEASE}.1.4.5rc03
+#   VERSION 14.${PNGLIB_RELEASE}.1.4.5
     VERSION 14.${PNGLIB_RELEASE}.0
     SOVERSION 14
     CLEAN_DIRECT_OUTPUT 1)
diff --git a/INSTALL b/INSTALL
index c7d517548..70fd4bf6b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
 
-Installing libpng version 1.4.5rc03 - December 3, 2010
+Installing libpng version 1.4.5 - December 9, 2010
 
 On Unix/Linux and similar systems, you can simply type
 
@@ -46,7 +46,7 @@ to have access to the zlib.h and zconf.h include files that
 correspond to the version of zlib that's installed.
 
 You can rename the directories that you downloaded (they
-might be called "libpng-1.4.5rc03" or "libpng14" and "zlib-1.2.3"
+might be called "libpng-1.4.5" or "libpng14" and "zlib-1.2.3"
 or "zlib123") so that you have directories called "zlib" and "libpng".
 
 Your directory structure should look like this:
diff --git a/LICENSE b/LICENSE
index b94d7c3a1..734398fc5 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.4.5rc03, December 3, 2010, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.5, December 9, 2010, are
 Copyright (c) 2004, 2006-2010 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 3, 2010
+December 9, 2010
diff --git a/README b/README
index 3e39d0edc..9500f3a51 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.4.5rc03 - December 3, 2010 (shared library 14.0)
+README for libpng version 1.4.5 - December 9, 2010 (shared library 14.0)
 See the note about version numbers near the top of png.h
 
 See INSTALL for instructions on how to install libpng.
@@ -185,9 +185,9 @@ Files in this distribution:
        makefile.std     =>  Generic UNIX makefile (cc, creates static
                             libpng.a)
        makefile.elf     =>  Linux/ELF makefile symbol versioning,
-                            (gcc, creates libpng14.so.14.1.4.5rc03)
+                            (gcc, creates libpng14.so.14.1.4.5)
        makefile.linux   =>  Linux/ELF makefile
-                            (gcc, creates libpng14.so.14.1.4.5rc03)
+                            (gcc, creates libpng14.so.14.1.4.5)
        makefile.gcc     =>  Generic makefile (gcc, creates static libpng.a)
        makefile.knr     =>  Archaic UNIX Makefile that converts files with
                             ansi2knr (Requires ansi2knr.c from
@@ -209,12 +209,12 @@ Files in this distribution:
        makefile.openbsd =>  OpenBSD makefile
        makefile.sgi     =>  Silicon Graphics IRIX (cc, creates static lib)
        makefile.sggcc   =>  Silicon Graphics
-                            (gcc, creates libpng14.so.14.1.4.5rc03)
+                            (gcc, creates libpng14.so.14.1.4.5)
        makefile.sunos   =>  Sun makefile
        makefile.solaris =>  Solaris 2.X makefile
-                            (gcc, creates libpng14.so.14.1.4.5rc03)
+                            (gcc, creates libpng14.so.14.1.4.5)
        makefile.so9     =>  Solaris 9 makefile
-                            (gcc, creates libpng14.so.14.1.4.5rc03)
+                            (gcc, creates libpng14.so.14.1.4.5)
        makefile.32sunu  =>  Sun Ultra 32-bit makefile
        makefile.64sunu  =>  Sun Ultra 64-bit makefile
        makefile.sco     =>  For SCO OSr5  ELF and Unixware 7 with Native cc
diff --git a/configure b/configure
index 919813ac8..6077d75dd 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.65 for libpng 1.4.5rc03.
+# Generated by GNU Autoconf 2.65 for libpng 1.4.5.
 #
 # Report bugs to <png-mng-implement@lists.sourceforge.net>.
 #
@@ -562,8 +562,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libpng'
 PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.4.5rc03'
-PACKAGE_STRING='libpng 1.4.5rc03'
+PACKAGE_VERSION='1.4.5'
+PACKAGE_STRING='libpng 1.4.5'
 PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -1292,7 +1292,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.4.5rc03 to adapt to many kinds of systems.
+\`configure' configures libpng 1.4.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1362,7 +1362,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libpng 1.4.5rc03:";;
+     short | recursive ) echo "Configuration of libpng 1.4.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1467,7 +1467,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libpng configure 1.4.5rc03
+libpng configure 1.4.5
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1892,7 +1892,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.4.5rc03, which was
+It was created by libpng $as_me 1.4.5, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2700,7 +2700,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libpng'
- VERSION='1.4.5rc03'
+ VERSION='1.4.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2764,7 +2764,7 @@ fi
 
 
 
-PNGLIB_VERSION=1.4.5rc03
+PNGLIB_VERSION=1.4.5
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=4
 PNGLIB_RELEASE=5
@@ -12175,7 +12175,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.4.5rc03, which was
+This file was extended by libpng $as_me 1.4.5, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12241,7 +12241,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.4.5rc03
+libpng config.status 1.4.5
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 99c08194c..eaca1334d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,14 +16,14 @@ dnl should not be necessary to regenerate configure if the time
 dnl stamps are correct
 AC_PREREQ(2.59)
 
-AC_INIT([libpng], [1.4.5rc03], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.4.5], [png-mng-implement@lists.sourceforge.net])
 AM_INIT_AUTOMAKE
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE
 
 dnl Version number stuff here:
 
-PNGLIB_VERSION=1.4.5rc03
+PNGLIB_VERSION=1.4.5
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=4
 PNGLIB_RELEASE=5
diff --git a/libpng-1.4.5rc03.txt b/libpng-1.4.5.txt
index 560c55633..d216709d8 100644
--- a/libpng-1.4.5rc03.txt
+++ b/libpng-1.4.5.txt
@@ -1,6 +1,6 @@
 libpng.txt - A description on how to use and modify libpng
 
- libpng version 1.4.5rc03 - December 3, 2010
+ libpng version 1.4.5 - December 9, 2010
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.4.5rc03 - December 3, 2010
+ libpng versions 0.97, January 1998, through 1.4.5 - December 9, 2010
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2010 Glenn Randers-Pehrson
 
@@ -903,7 +903,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.4.5rc03, not all possible expansions are supported.
+As of libpng version 1.4.5, 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
@@ -3303,13 +3303,13 @@ Other rules can be inferred by inspecting the libpng source.
 
 XIII. Y2K Compliance in libpng
 
-December 3, 2010
+December 9, 2010
 
 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.4.5rc03 are Y2K compliant.  It is my belief that earlier
+upward through 1.4.5 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 da6d1127e..da177d9c9 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "December 3, 2010"
+.TH LIBPNG 3 "December 9, 2010"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.5rc03
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.5
 .SH SYNOPSIS
 \fI\fB
 
@@ -785,7 +785,7 @@ Following is a copy of the libpng.txt file that accompanies libpng.
 .SH LIBPNG.TXT
 libpng.txt - A description on how to use and modify libpng
 
- libpng version 1.4.5rc03 - December 3, 2010
+ libpng version 1.4.5 - December 9, 2010
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -796,7 +796,7 @@ libpng.txt - A description on how to use and modify libpng
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.4.5rc03 - December 3, 2010
+ libpng versions 0.97, January 1998, through 1.4.5 - December 9, 2010
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2010 Glenn Randers-Pehrson
 
@@ -1688,7 +1688,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.4.5rc03, not all possible expansions are supported.
+As of libpng version 1.4.5, 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
@@ -4088,13 +4088,13 @@ Other rules can be inferred by inspecting the libpng source.
 
 .SH XIII. Y2K Compliance in libpng
 
-December 3, 2010
+December 9, 2010
 
 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.4.5rc03 are Y2K compliant.  It is my belief that earlier
+upward through 1.4.5 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
@@ -4284,7 +4284,8 @@ the first widely used release:
  1.4.5beta01-04      14    10405  14.so.14.5[.0]
  1.4.5rc01           14    10405  14.so.14.5[.0]
  1.4.5beta05-07      14    10405  14.so.14.5[.0]
- 1.4.5rc02           14    10405  14.so.14.5[.0]
+ 1.4.5rc02-03        14    10405  14.so.14.5[.0]
+ 1.4.5               14    10405  14.so.14.5[.0]
 
 Henceforth the source version will match the shared-library minor
 and patch numbers; the shared-library major version number will be
@@ -4340,7 +4341,7 @@ possible without all of you.
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.4.5rc03 - December 3, 2010:
+Libpng version 1.4.5 - December 9, 2010:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
 
@@ -4363,7 +4364,7 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.2.6, August 15, 2004, through 1.4.5rc03, December 3, 2010, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.5, December 9, 2010, 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
@@ -4462,7 +4463,7 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-December 3, 2010
+December 9, 2010
 
 .\" end of man page
 
diff --git a/libpngpf.3 b/libpngpf.3
index 651c059c7..32b4ab623 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "December 3, 2010"
+.TH LIBPNGPF 3 "December 9, 2010"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.5rc03
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.5
 (private functions)
 .SH SYNOPSIS
 \fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index 2b33cf1e9..5c265f5c6 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "December 3, 2010"
+.TH PNG 5 "December 9, 2010"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
diff --git a/png.c b/png.c
index 94ff53c94..00d258dff 100644
--- a/png.c
+++ b/png.c
@@ -17,7 +17,7 @@
 #include "pngpriv.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_5rc04 Your_png_h_is_not_version_1_4_5rc04;
+typedef version_1_4_5 Your_png_h_is_not_version_1_4_5;
 
 /* 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
@@ -547,13 +547,13 @@ png_get_copyright(png_structp png_ptr)
 #else
 #ifdef __STDC__
    return ((png_charp) PNG_STRING_NEWLINE \
-     "libpng version 1.4.5rc04 - December 9, 2010" PNG_STRING_NEWLINE \
+     "libpng version 1.4.5 - December 9, 2010" PNG_STRING_NEWLINE \
      "Copyright (c) 1998-2010 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 ((png_charp) "libpng version 1.4.5rc04 - December 9, 2010\
+      return ((png_charp) "libpng version 1.4.5 - December 9, 2010\
       Copyright (c) 1998-2010 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 dc9c1393f..b1f1bc364 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.4.5rc04 - December 9, 2010
+ * libpng version 1.4.5 - December 9, 2010
  * Copyright (c) 1998-2010 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.4.5rc04 - December 9, 2010: Glenn
+ *  libpng versions 0.97, January 1998, through 1.4.5 - December 9, 2010: Glenn
  *  See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -151,7 +151,8 @@
  *    1.4.5beta01-04          14    10405  14.so.14.5[.0]
  *    1.4.5rc01               14    10405  14.so.14.5[.0]
  *    1.4.5beta05-07          14    10405  14.so.14.5[.0]
- *    1.4.5rc02-04            14    10405  14.so.14.5[.0]
+ *    1.4.5rc02-03            14    10405  14.so.14.5[.0]
+ *    1.4.5                   14    10405  14.so.14.5[.0]
  *
  *    Henceforth the source version will match the shared-library major
  *    and minor numbers; the shared-library major version number will be
@@ -183,7 +184,7 @@
  *
  * This code is released under the libpng license.
  *
- * libpng versions 1.2.6, August 15, 2004, through 1.4.5rc04, December 9, 2010, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.4.5, December 9, 2010, are
  * Copyright (c) 2004, 2006-2010 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:
@@ -301,7 +302,7 @@
  *    an official declaration.
  *
  *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.4.5rc04 are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.4.5 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
@@ -357,9 +358,9 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.4.5rc04"
+#define PNG_LIBPNG_VER_STRING "1.4.5"
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.4.5rc04 - December 9, 2010\n"
+   " libpng version 1.4.5 - December 9, 2010\n"
 
 #define PNG_LIBPNG_VER_SONUM   14
 #define PNG_LIBPNG_VER_DLLNUM  14
@@ -372,7 +373,7 @@
  * PNG_LIBPNG_VER_STRING, omitting any leading zero:
  */
 
-#define PNG_LIBPNG_VER_BUILD  04
+#define PNG_LIBPNG_VER_BUILD  0
 
 /* Release Status */
 #define PNG_LIBPNG_BUILD_ALPHA    1
@@ -1481,7 +1482,7 @@ struct png_struct_def
 /* This triggers a compiler error in png.c, if png.c and png.h
  * do not agree upon the version number.
  */
-typedef png_structp version_1_4_5rc04;
+typedef png_structp version_1_4_5;
 
 typedef png_struct FAR * FAR * png_structpp;
 
diff --git a/pngconf.h b/pngconf.h
index 36cc97aeb..8a6d83698 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.4.5rc04 - December 9, 2010
+ * libpng version 1.4.5 - December 9, 2010
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2010 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngpriv.h b/pngpriv.h
index a1ae7682d..7112c8da1 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1,7 +1,7 @@
 
 /* pngpriv.h - private declarations for use inside libpng
  *
- * libpng version 1.4.5rc04 - December 9, 2010
+ * libpng version 1.4.5 - December 9, 2010
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2010 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngtest.c b/pngtest.c
index c81f59026..1481104b8 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1687,4 +1687,4 @@ main(int argc, char *argv[])
 }
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_5rc04 your_png_h_is_not_version_1_4_5rc04;
+typedef version_1_4_5 your_png_h_is_not_version_1_4_5;
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index 678e2bebe..5ef1578be 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
 
 VisualStudio instructions
 
-libpng version 1.4.5rc04 - December 9, 2010
+libpng version 1.4.5 - December 9, 2010
 
 Copyright (c) 1998-2010 Glenn Randers-Pehrson
 
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 4f459db40..e69ec8f50 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
 <!--
  * zlib.props - location of zlib source and build
  *
- * libpng version 1.4.5rc04 - December 9, 2010
+ * libpng version 1.4.5 - December 9, 2010
  *
  * Copyright (c) 1998-2010 Glenn Randers-Pehrson
  *
diff --git a/scripts/README.txt b/scripts/README.txt
index f1e6d6b4a..a9735c785 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,8 +1,8 @@
 
-Makefiles for  libpng version 1.4.5rc04 - December 9, 2010
+Makefiles for  libpng version 1.4.5 - December 9, 2010
 
  makefile.linux    =>  Linux/ELF makefile
-                       (gcc, creates libpng14.so.14.1.4.5rc04)
+                       (gcc, creates libpng14.so.14.1.4.5)
  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 @@ Makefiles for  libpng version 1.4.5rc04 - December 9, 2010
  makefile.dec      =>  DEC Alpha UNIX makefile
  makefile.dj2      =>  DJGPP 2 makefile
  makefile.elf      =>  Linux/ELF makefile symbol versioning,
-                       (gcc, creates libpng14.so.14.1.4.5rc04)
+                       (gcc, creates libpng14.so.14.1.4.5)
  makefile.freebsd  =>  FreeBSD makefile
  makefile.gcc      =>  Generic gcc makefile
  makefile.hpgcc    =>  HPUX makefile using gcc
@@ -36,12 +36,12 @@ Makefiles for  libpng version 1.4.5rc04 - December 9, 2010
  makefile.os2      =>  OS/2 Makefile (gcc and emx, requires pngos2.def)
  makefile.sco      =>  For SCO OSr5  ELF and Unixware 7 with Native cc
  makefile.sggcc    =>  Silicon Graphics (gcc,
-                       creates libpng14.so.14.1.4.5rc04)
+                       creates libpng14.so.14.1.4.5)
  makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
  makefile.solaris  =>  Solaris 2.X makefile (gcc,
-                       creates libpng14.so.14.1.4.5rc04)
+                       creates libpng14.so.14.1.4.5)
  makefile.so9      =>  Solaris 9 makefile (gcc,
-                       creates libpng14.so.14.1.4.5rc04)
+                       creates libpng14.so.14.1.4.5)
  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 3a4ad941b..c92c9e2f4 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@
 
 # Modeled after libxml-config.
 
-version=1.4.5rc04
+version=1.4.5
 prefix=""
 libdir=""
 libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 8e069b18a..131d6e37a 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng14
 
 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.4.5rc04
+Version: 1.4.5
 Libs: -L${libdir} -lpng14
 Cflags: -I${includedir}
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index ca9ebc1d2..aeea61c59 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng14
 
 LIB=	png14
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.4.5rc04
+SHLIB_MINOR=	1.4.5
 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 b309ffe28..8500e9a52 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
 
 LIB=	png
 SHLIB_MAJOR=	3
-SHLIB_MINOR=	1.4.5rc04
+SHLIB_MINOR=	1.4.5
 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 8f18167bc..21b6840bb 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -11,7 +11,7 @@ LIBDIR=	${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat
 
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.4.5rc04
+SHLIB_MINOR=	1.4.5
 
 LIB=	png
 SRCS=	png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/png32ce.def b/scripts/png32ce.def
index a7478db86..a934b27a0 100644
--- a/scripts/png32ce.def
+++ b/scripts/png32ce.def
@@ -15,7 +15,7 @@ LIBRARY lpngce
  png_get_int_32
 
 EXPORTS
-;Version 1.4.5rc04
+;Version 1.4.5
   png_build_grayscale_palette  @1
 ;  png_check_sig        @2
   png_chunk_error      @3
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index a88f50eb4..0b4f4ea57 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
 ; PNG.LIB module definition file for OS/2
 ;----------------------------------------
 
-; Version 1.4.5rc04
+; Version 1.4.5
 
 LIBRARY		PNG
 DESCRIPTION	"PNG image compression library for OS/2"
diff --git a/scripts/pngwin.def b/scripts/pngwin.def
index 1798ffc38..d39f37e94 100644
--- a/scripts/pngwin.def
+++ b/scripts/pngwin.def
@@ -5,7 +5,7 @@
 LIBRARY
 
 EXPORTS
-;Version 1.4.5rc04
+;Version 1.4.5
   png_build_grayscale_palette
   png_chunk_error
   png_chunk_warning