[master] Imported from libpng-1.4.8.tar

e7625063 · Glenn Randers-Pehrson · 24f40e32 · e7625063 · e7625063 · e7625063
35 changed file
--- a/ANNOUNCE
+++ b/ANNOUNCE

-Libpng 1.4.8rc01 - June 30, 2011
+Libpng 1.4.8 - July 7, 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.4.8rc01.tar.xz (LZMA-compressed, recommended)
-   1.4.8rc01.tar.gz
-   1.4.8rc01.tar.bz2
+   libpng-1.4.8.tar.xz (LZMA-compressed, recommended)
+   libpng-1.4.8.tar.gz
+   libpng-1.4.8.tar.bz2

 Source files with CRLF line endings (for Windows), without the
 "configure" script

-   lp148r01.7z (LZMA-compressed, recommended)
-   lp148r01.zip
+   lpng148.7z (LZMA-compressed, recommended)
+   lpng148.zip

 Other information:

-   1.4.8rc01-README.txt
-   1.4.8rc01-LICENSE.txt
+   libpng-1.4.8-README.txt
+   libpng-1.4.8-LICENSE.txt

 Changes since the last public release (1.4.7):

-version 1.4.8beta01 [June 4, 2011]
  Undef "_ALL_SOURCE" for AIX, to prevent "jmpbuf" from being redefined.
  Copied png_debug macros from pngpriv.h into pngtest.c and removed
    "#include pngpriv.h" from pngtest.c, to avoid setting a bad example.
@@ -36,25 +34,14 @@ version 1.4.8beta01 [June 4, 2011]
    before IDAT.
  Ported bugfix in pngrtran.c from 1.5.3: when expanding a paletted image,
    always expand to RGBA if transparency is present.
-
-version 1.4.8beta02 [June 5, 2011]
  Ported bugfix in pngrtran.c from 1.5.3: Ensure coefficients are OK for
-    png_rgb_to_gray_fixed().
-
-version 1.4.8beta03 [June 6, 2011]
-  Check for integer overflow in png_set_rgb_to_gray().
-
-version 1.4.8beta04 [June 7, 2011]
+    png_rgb_to_gray_fixed(); check for integer overflow in
+    png_set_rgb_to_gray().
  Fixed uninitialized memory read in png_format_buffer() (Bug report by
    Frank Busse, related to CVE-2004-0421).
-
-version 1.4.8beta05 [June 19, 2011]
  Fixed error in "ACCURATE" 16-to-8 scaling (John Bowler).
  Check for sCAL chunk too short.

-version 1.4.8rc01 [June 30, 2011]
-  No changes.
-
 Send comments/corrections/commendations to glennrp at users.sourceforge.net
 or to png-mng-implement at lists.sf.net (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement).

--- a/CHANGES
+++ b/CHANGES
@@ -2823,6 +2823,9 @@ version 1.4.8beta05 [June 19, 2011]
 version 1.4.8rc01 [June 30, 2011]
  No changes.

+version 1.4.8 [July 7, 2011]
+  No changes.
+
 Send comments/corrections/commendations to glennrp at users.sourceforge.net
 or to png-mng-implement at lists.sf.net (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement).

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -255,7 +255,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.8rc01
+#   VERSION 14.${PNGLIB_RELEASE}.1.4.8
    VERSION 14.${PNGLIB_RELEASE}.0
    SOVERSION 14
    CLEAN_DIRECT_OUTPUT 1)

--- a/INSTALL
+++ b/INSTALL

-Installing libpng version 1.4.8rc01 - June 30, 2011
+Installing libpng version 1.4.8 - July 7, 2011

 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.8rc01" or "libpng14" and "zlib-1.2.3"
+might be called "libpng-1.4.8" 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:

--- 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.8rc01, June 30, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.8, July 7, 2011, 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
-June 30, 2011
+July 7, 2011
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,7 +72,7 @@ EXTRA_DIST= \
 	${srcdir}/contrib/pngsuite/* \
 	${srcdir}/contrib/visupng/* \
 	$(TESTS) \
-	example.c libpng-1.4.8rc01.txt
+	example.c libpng-1.4.8.txt

 CLEANFILES= pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \
 libpng.sym

--- a/Makefile.in
+++ b/Makefile.in
@@ -331,7 +331,7 @@ EXTRA_DIST = \
 	${srcdir}/contrib/pngsuite/* \
 	${srcdir}/contrib/visupng/* \
 	$(TESTS) \
-	example.c libpng-1.4.8rc01.txt
+	example.c libpng-1.4.8.txt

 CLEANFILES = pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \
 libpng.sym

--- a/README
+++ b/README
-README for libpng version 1.4.8rc01 - June 30, 2011 (shared library 14.0)
+README for libpng version 1.4.8 - July 7, 2011 (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.
@@ -182,9 +182,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.8rc01)
+                            (gcc, creates libpng14.so.14.1.4.8)
       makefile.linux   =>  Linux/ELF makefile
-                            (gcc, creates libpng14.so.14.1.4.8rc01)
+                            (gcc, creates libpng14.so.14.1.4.8)
       makefile.gcc     =>  Generic makefile (gcc, creates static libpng.a)
       makefile.knr     =>  Archaic UNIX Makefile that converts files with
                            ansi2knr (Requires ansi2knr.c from
@@ -206,12 +206,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.8rc01)
+                            (gcc, creates libpng14.so.14.1.4.8)
       makefile.sunos   =>  Sun makefile
       makefile.solaris =>  Solaris 2.X makefile
-                            (gcc, creates libpng14.so.14.1.4.8rc01)
+                            (gcc, creates libpng14.so.14.1.4.8)
       makefile.so9     =>  Solaris 9 makefile
-                            (gcc, creates libpng14.so.14.1.4.8rc01)
+                            (gcc, creates libpng14.so.14.1.4.8)
       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

--- a/configure
+++ b/configure
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for libpng 1.4.8rc01.
+# Generated by GNU Autoconf 2.65 for libpng 1.4.8.
 #
 # 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.8rc01'
-PACKAGE_STRING='libpng 1.4.8rc01'
+PACKAGE_VERSION='1.4.8'
+PACKAGE_STRING='libpng 1.4.8'
 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.8rc01 to adapt to many kinds of systems.
+\`configure' configures libpng 1.4.8 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.8rc01:";;
+     short | recursive ) echo "Configuration of libpng 1.4.8:";;
   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.8rc01
+libpng configure 1.4.8
 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.8rc01, which was
+It was created by libpng $as_me 1.4.8, 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.8rc01'
+ VERSION='1.4.8'


 cat >>confdefs.h <<_ACEOF
@@ -2764,7 +2764,7 @@ fi



-PNGLIB_VERSION=1.4.8rc01
+PNGLIB_VERSION=1.4.8
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=4
 PNGLIB_RELEASE=8
@@ -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.8rc01, which was
+This file was extended by libpng $as_me 1.4.8, 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.8rc01
+libpng config.status 1.4.8
 configured by $0, generated by GNU Autoconf 2.65,
  with options \\"\$ac_cs_config\\"


--- 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.8rc01], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.4.8], [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.8rc01
+PNGLIB_VERSION=1.4.8
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=4
 PNGLIB_RELEASE=8

--- a/libpng-1.4.8rc01.txt
+++ b/libpng-1.4.8rc01.txt
 libpng.txt - A description on how to use and modify libpng

- libpng version 1.4.8rc01 - June 30, 2011
+ libpng version 1.4.8 - July 7, 2011
 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.8rc01 - June 30, 2011
+ libpng versions 0.97, January 1998, through 1.4.8 - July 7, 2011
 Updated and distributed by Glenn Randers-Pehrson
 Copyright (c) 1998-2010 Glenn Randers-Pehrson

@@ -905,7 +905,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.8rc01, not all possible expansions are supported.
+As of libpng version 1.4.8, 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
@@ -3307,13 +3307,13 @@ Other rules can be inferred by inspecting the libpng source.

 XIII. Y2K Compliance in libpng

-June 30, 2011
+July 7, 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.4.8rc01 are Y2K compliant.  It is my belief that earlier
+upward through 1.4.8 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

--- a/libpng.3
+++ b/libpng.3
-.TH LIBPNG 3 "June 30, 2011"
+.TH LIBPNG 3 "July 7, 2011"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.8rc01
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.8
 .SH SYNOPSIS
 \fI\fB

@@ -895,7 +895,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
 .SH LIBPNG.TXT
 libpng.txt - A description on how to use and modify libpng

- libpng version 1.4.8rc01 - June 30, 2011
+ libpng version 1.4.8 - July 7, 2011
 Updated and distributed by Glenn Randers-Pehrson
 <glennrp at users.sourceforge.net>
 Copyright (c) 1998-2010 Glenn Randers-Pehrson
@@ -906,7 +906,7 @@ libpng.txt - A description on how to use and modify libpng

 Based on:

- libpng versions 0.97, January 1998, through 1.4.8rc01 - June 30, 2011
+ libpng versions 0.97, January 1998, through 1.4.8 - July 7, 2011
 Updated and distributed by Glenn Randers-Pehrson
 Copyright (c) 1998-2010 Glenn Randers-Pehrson

@@ -1800,7 +1800,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.8rc01, not all possible expansions are supported.
+As of libpng version 1.4.8, 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
@@ -4202,13 +4202,13 @@ Other rules can be inferred by inspecting the libpng source.

 .SH XIII. Y2K Compliance in libpng

-June 30, 2011
+July 7, 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.4.8rc01 are Y2K compliant.  It is my belief that earlier
+upward through 1.4.8 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
@@ -4407,6 +4407,7 @@ the first widely used release:
 1.4.7               14    10407  14.so.14.7[.0]
 1.4.8beta01-05      14    10408  14.so.14.8[.0]
 1.4.8rc01           14    10408  14.so.14.8[.0]
+ 1.4.8               14    10408  14.so.14.8[.0]

 Henceforth the source version will match the shared-library minor
 and patch numbers; the shared-library major version number will be
@@ -4462,7 +4463,7 @@ possible without all of you.

 Thanks to Frank J. T. Wojcik for helping with the documentation.

-Libpng version 1.4.8rc01 - June 30, 2011:
+Libpng version 1.4.8 - July 7, 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).

@@ -4485,7 +4486,7 @@ this sentence.

 This code is released under the libpng license.

-libpng versions 1.2.6, August 15, 2004, through 1.4.8rc01, June 30, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.8, July 7, 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
@@ -4584,7 +4585,7 @@ certification mark of the Open Source Initiative.

 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-June 30, 2011
+July 7, 2011

 .\" end of man page

--- a/libpngpf.3
+++ b/libpngpf.3
-.TH LIBPNGPF 3 "June 30, 2011"
+.TH LIBPNGPF 3 "July 7, 2011"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.8rc01
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.8
 (private functions)
 .SH SYNOPSIS
 \fB#include <png.h>\fP

--- a/png.5
+++ b/png.5
-.TH PNG 5 "June 30, 2011"
+.TH PNG 5 "July 7, 2011"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION

--- 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_8rc01 Your_png_h_is_not_version_1_4_8rc01;
+typedef version_1_4_8 Your_png_h_is_not_version_1_4_8;

 /* 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_const_structp png_ptr)
 #else
 #ifdef __STDC__
   return ((png_charp) PNG_STRING_NEWLINE \
-     "libpng version 1.4.8rc01 - June 30, 2011" PNG_STRING_NEWLINE \
+     "libpng version 1.4.8 - July 7, 2011" 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.8rc01 - June 30, 2011\
+      return ((png_charp) "libpng version 1.4.8 - July 7, 2011\
      Copyright (c) 1998-2010 Glenn Randers-Pehrson\
      Copyright (c) 1996-1997 Andreas Dilger\
      Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");

--- a/png.h
+++ b/png.h

 /* png.h - header file for PNG reference library
 *
- * libpng version 1.4.8rc01 - June 30, 2011
+ * libpng version 1.4.8 - July 7, 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.4.8rc01 - June 30, 2011: Glenn
+ *  libpng versions 0.97, January 1998, through 1.4.8 - July 7, 2011: Glenn
 *  See also "Contributing Authors", below.
 *
 * Note about libpng version numbers:
@@ -160,6 +160,7 @@
 *    1.4.7                   14    10407  14.so.14.7[.0]
 *    1.4.8beta01-05          14    10408  14.so.14.8[.0]
 *    1.4.8rc01               14    10408  14.so.14.8[.0]
+ *    1.4.8                   14    10408  14.so.14.8[.0]
 *
 *    Henceforth the source version will match the shared-library major
 *    and minor numbers; the shared-library major version number will be
@@ -191,7 +192,7 @@
 *
 * This code is released under the libpng license.
 *
- * libpng versions 1.2.6, August 15, 2004, through 1.4.8rc01, June 30, 2011, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.4.8, July 7, 2011, 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:
@@ -303,13 +304,13 @@
 * Y2K compliance in libpng:
 * =========================
 *
- *    June 30, 2011
+ *    July 7, 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.4.8rc01 are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.4.8 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
@@ -365,9 +366,9 @@
 */

 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.4.8rc01"
+#define PNG_LIBPNG_VER_STRING "1.4.8"
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.4.8rc01 - June 30, 2011\n"
+   " libpng version 1.4.8 - July 7, 2011\n"

 #define PNG_LIBPNG_VER_SONUM   14
 #define PNG_LIBPNG_VER_DLLNUM  14
@@ -380,7 +381,7 @@
 * PNG_LIBPNG_VER_STRING, omitting any leading zero:
 */

-#define PNG_LIBPNG_VER_BUILD  01
+#define PNG_LIBPNG_VER_BUILD  0

 /* Release Status */
 #define PNG_LIBPNG_BUILD_ALPHA    1
@@ -1491,7 +1492,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_8rc01;
+typedef png_structp version_1_4_8;

 typedef png_struct FAR * FAR * png_structpp;


--- a/pngconf.h
+++ b/pngconf.h

 /* pngconf.h - machine configurable file for libpng
 *
- * libpng version 1.4.8rc01 - June 30, 2011
+ * libpng version 1.4.8 - July 7, 2011
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2011 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

--- a/pngerror.c
+++ b/pngerror.c

 /* pngerror.c - stub functions for i/o and memory allocation
 *
- * Last changed in libpng 1.4.8 [June 30, 2011]
+ * Last changed in libpng 1.4.8 [July 7, 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.)

--- a/pngpriv.h
+++ b/pngpriv.h

 /* pngpriv.h - private declarations for use inside libpng
 *
- * libpng version 1.4.8rc01 - June 30, 2011
+ * libpng version 1.4.8 - July 7, 2011
 * For conditions of distribution and use, see copyright notice in png.h
 * Copyright (c) 1998-2011 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

--- a/pngrtran.c
+++ b/pngrtran.c

 /* pngrtran.c - transforms the data in a row for PNG readers
 *
- * Last changed in libpng 1.4.8 [June 30, 2011]
+ * Last changed in libpng 1.4.8 [July 7, 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.)

--- a/pngrutil.c
+++ b/pngrutil.c

 /* pngrutil.c - utilities to read a PNG file
 *
- * Last changed in libpng 1.4.8 [June 30, 2011]
+ * Last changed in libpng 1.4.8 [July 7, 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.)

--- a/pngtest.c
+++ b/pngtest.c

 /* pngtest.c - a simple test program to test libpng
 *
- * Last changed in libpng 1.4.8 [June 30, 2011]
+ * Last changed in libpng 1.4.8 [July 7, 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.)
@@ -1702,4 +1702,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_8rc01 your_png_h_is_not_version_1_4_8rc01;
+typedef version_1_4_8 your_png_h_is_not_version_1_4_8;
--- a/pngwrite.c
+++ b/pngwrite.c

 /* pngwrite.c - general routines to write a PNG file
 *
- * Last changed in libpng 1.4.8 [June 30, 2011]
+ * Last changed in libpng 1.4.8 [July 7, 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.)

--- a/pngwutil.c
+++ b/pngwutil.c

 /* pngwutil.c - utilities to write a PNG file
 *
- * Last changed in libpng 1.4.8 [June 30, 2011]
+ * Last changed in libpng 1.4.8 [July 7, 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.)

--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt

 VisualStudio instructions

-libpng version 1.4.8rc01 - June 30, 2011
+libpng version 1.4.8 - July 7, 2011

 Copyright (c) 1998-2010 Glenn Randers-Pehrson


--- 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.8rc01 - June 30, 2011
+ * libpng version 1.4.8 - July 7, 2011
 *
 * Copyright (c) 1998-2011 Glenn Randers-Pehrson
 *

--- a/scripts/README.txt
+++ b/scripts/README.txt

-Makefiles for  libpng version 1.4.8rc01 - June 30, 2011
+Makefiles for  libpng version 1.4.8 - July 7, 2011

 makefile.linux    =>  Linux/ELF makefile
-                       (gcc, creates libpng14.so.14.1.4.8rc01)
+                       (gcc, creates libpng14.so.14.1.4.8)
 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.8rc01 - June 30, 2011
 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.8rc01)
+                       (gcc, creates libpng14.so.14.1.4.8)
 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.8rc01 - June 30, 2011
 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.8rc01)
+                       creates libpng14.so.14.1.4.8)
 makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
 makefile.solaris  =>  Solaris 2.X makefile (gcc,
-                       creates libpng14.so.14.1.4.8rc01)
+                       creates libpng14.so.14.1.4.8)
 makefile.so9      =>  Solaris 9 makefile (gcc,
-                       creates libpng14.so.14.1.4.8rc01)
+                       creates libpng14.so.14.1.4.8)
 makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
 makefile.sunos    =>  Sun makefile
 makefile.32sunu   =>  Sun Ultra 32-bit makefile

--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@

 # Modeled after libxml-config.

-version=1.4.8rc01
+version=1.4.8
 prefix=""
 libdir=""
 libs=""

--- 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.8rc01
+Version: 1.4.8
 Libs: -L${libdir} -lpng14
 Cflags: -I${includedir}
--- 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.8rc01
+SHLIB_MINOR=	1.4.8
 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

--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include

 LIB=	png
 SHLIB_MAJOR=	3
-SHLIB_MINOR=	1.4.8rc01
+SHLIB_MINOR=	1.4.8
 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

--- 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.8rc01
+SHLIB_MINOR=	1.4.8

 LIB=	png
 SRCS=	png.c pngerror.c pngget.c pngmem.c pngpread.c \

--- a/scripts/png32ce.def
+++ b/scripts/png32ce.def
@@ -15,7 +15,7 @@ LIBRARY lpngce
 png_get_int_32

 EXPORTS
-;Version 1.4.8rc01
+;Version 1.4.8
  png_build_grayscale_palette  @1
 ;  png_check_sig        @2
  png_chunk_error      @3

--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
 ; PNG.LIB module definition file for OS/2
 ;----------------------------------------

-; Version 1.4.8rc01
+; Version 1.4.8

 LIBRARY		PNG
 DESCRIPTION	"PNG image compression library for OS/2"

--- a/scripts/pngwin.def
+++ b/scripts/pngwin.def
@@ -5,7 +5,7 @@
 LIBRARY

 EXPORTS
-;Version 1.4.8rc01
+;Version 1.4.8
  png_build_grayscale_palette
  png_chunk_error
  png_chunk_warning