Imported from libpng-1.2.10.tar

ANNOUNCE

@@ -1,72 +1,53 @@
 
-Libpng 1.2.10rc1 - April 19, 2006
+Libpng 1.2.10 - April 23, 2006
 
-This is not intended to be a public release.  It will be replaced
+This is a public release of libpng, intended for use in production codes.
-within a few weeks by a public version or by another test version.
 
 Files available for download:
 
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   1.2.10rc1.tar.gz
+   libpng-1.2.10.tar.gz
-   1.2.10rc1.tar.bz2
+   libpng-1.2.10.tar.bz2
 
 Source files with LF line endings (for Unix/Linux) without the
 "configure" script
 
-   1.2.10rc1-no-config.tar.gz
+   libpng-1.2.10-no-config.tar.gz
-   1.2.10rc1-no-config.tar.bz2
+   libpng-1.2.10-no-config.tar.bz2
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp1210r01.zip
+   lpng1210.zip
-   lp1210r01.tar.bz2
+   lpng1210.tar.bz2
 
 Project files
 
-   1.2.10rc1-project-netware.zip
+   libpng-1.2.10-project-netware.zip
-   1.2.10rc1-project-wince.zip
+   libpng-1.2.10-project-wince.zip
 
 Other information:
 
-   1.2.10rc1-README.txt
+   libpng-1.2.10-README.txt
-   1.2.10rc1-KNOWNBUGS.txt
+   libpng-1.2.10-KNOWNBUGS.txt
-   1.2.10rc1-LICENSE.txt
+   libpng-1.2.10-LICENSE.txt
-   1.2.10rc1-Y2K-compliance.txt
+   libpng-1.2.10-Y2K-compliance.txt
 
 Changes since the last public release (1.2.9):
 
-version 1.2.10beta1 [April 15, 2006]
+version 1.2.10 [April 23, 2006]
-  Renamed "config.h" to "png_conf.h" and revised Makefile.am to add
+  Revised Makefile.am to add -DPNG_CONFIGURE_LIBPNG to compile directive,
-    -DPNG_BUILDING_LIBPNG to compile directive, and modified pngconf.h
+    and modified pngconf.h to include config.h only when PNG_CONFIGURE_LIBPNG
-    to include png_conf.h only when PNG_BUILDING_LIBPNG is defined.
+    is defined.
-
-version 1.2.10beta2 [April 15, 2006]
-  Manually updated Makefile.in and configure.  Changed png_conf.h.in
-    back to config.h.
-
-version 1.2.10beta3 [April 15, 2006]
-  Change png_conf.h back to config.h in pngconf.h.
-
-version 1.2.10beta4 [April 16, 2006]
-  Change PNG_BUILDING_LIBPNG to PNG_CONFIGURE_LIBPNG in config/Makefile*.
-
-version 1.2.10beta5 [April 16, 2006]
   Added a configure check for compiling assembler code in pnggccrd.c
-
-version 1.2.10beta6 [April 17, 2006]
-  Revised the configure check for pnggccrd.c
-  Moved -DPNG_CONFIGURE_LIBPNG into @LIBPNG_DEFINES@
-  Added @LIBPNG_DEFINES@ to arguments when building libpng.sym
-
-version 1.2.10beta7 [April 18, 2006]
   Change "exec_prefix=$prefix" to "exec_prefix=$(prefix)" in makefiles.
-
-version 1.2.10beta8 [April 19, 2006]
   Ensure pngconf.h doesn't define both PNG_USE_PNGGCCRD and PNG_USE_PNGVCRD
   Fixed "LN_FS" typo in makefile.sco and makefile.solaris.
+  Made the configure warning about versioned symbols less arrogant.
+  Added a note in libpng.txt that png_set_sig_bytes(8) can be used when
+    writing an embedded PNG without the 8-byte signature.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit 

CHANGES

@@ -1552,6 +1552,19 @@ version 1.2.10rc1 [April 19, 2006]
   Ensure pngconf.h doesn't define both PNG_USE_PNGGCCRD and PNG_USE_PNGVCRD
   Fixed "LN_FS" typo in makefile.sco and makefile.solaris.
 
+version 1.2.10rc2 [April 20, 2006]
+  Added a backslash between -DPNG_CONFIGURE_LIBPNG and -DPNG_NO_ASSEMBLER_CODE
+   in configure.ac and configure
+  Made the configure warning about versioned symbols less arrogant.
+
+version 1.2.10rc3 [April 21, 2006]
+  Added a note in libpng.txt that png_set_sig_bytes(8) can be used when
+    writing an embedded PNG without the 8-byte signature.
+  Revised makefiles and configure to avoid making links to libpng.so.*
+
+version 1.2.10 [April 23, 2006]
+  Reverted configure to "rc2" state.
+
 version 1.4.0beta1 [future]
   Enabled iTXt support (changes png_struct, thus requires so-number change).
   Removed deprecated functions png_read_init, png_write_init, png_info_init,

INSTALL

@@ -1,5 +1,5 @@
 
-Installing libpng version 1.2.10rc1 - April 19, 2006
+Installing libpng version 1.2.10 - April 23, 2006
 
 On Unix/Linux and similar systems, you can simply type
 
@@ -29,7 +29,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.2.10rc1" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.2.10" or "lpng109" and "zlib-1.2.1"
 or "zlib121") so that you have directories called "zlib" and "libpng".
 
 Your directory structure should look like this:
@@ -85,11 +85,11 @@ include
 
  makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
  makefile.elf      =>  Linux/ELF makefile symbol versioning,
-                       gcc, creates libpng12.so.0.1.2.10rc1)
+                       gcc, creates libpng12.so.0.1.2.10)
  makefile.linux    =>  Linux/ELF makefile
-                       (gcc, creates libpng12.so.0.1.2.10rc1)
+                       (gcc, creates libpng12.so.0.1.2.10)
  makefile.gcmmx    =>  Linux/ELF makefile
-                       (gcc, creates libpng12.so.0.1.2.10rc1,
+                       (gcc, creates libpng12.so.0.1.2.10,
                        uses assembler code tuned for Intel MMX platform)
  makefile.gcc      =>  Generic makefile (gcc, creates static libpng.a)
  makefile.knr      =>  Archaic UNIX Makefile that converts files with
@@ -112,12 +112,12 @@ include
  makefile.openbsd  =>  OpenBSD makefile
  makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
  makefile.sggcc    =>  Silicon Graphics (gcc,
-                       creates libpng12.so.0.1.2.10rc1)
+                       creates libpng12.so.0.1.2.10)
  makefile.sunos    =>  Sun makefile
  makefile.solaris  =>  Solaris 2.X makefile (gcc,
-                       creates libpng12.so.0.1.2.10rc1)
+                       creates libpng12.so.0.1.2.10)
  makefile.so9      =>  Solaris 9 makefile (gcc,
-                       creates libpng12.so.0.1.2.10rc1)
+                       creates libpng12.so.0.1.2.10)
  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

KNOWNBUG

@@ -1,5 +1,5 @@
 
-Known bugs in libpng version 1.2.10rc1
+Known bugs in libpng version 1.2.10
 
 1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when
    reading interlaced PNG files, when assembler code is enabled but running

LICENSE

@@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
 If you modify libpng you may insert additional notices immediately following
 this sentence.
 
-libpng versions 1.2.6, August 15, 2004, through 1.2.10rc1, April 19, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.10, April 23, 2006, are
 Copyright (c) 2004, 2006 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
@@ -106,4 +106,4 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-April 19, 2006
+April 23, 2006

Makefile.am

@@ -116,19 +116,16 @@ install-data-hook:
 	cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc
 	cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
 
-# do evil things to libpng to cause libpng12 to be used, if
+# do evil things to libpng to cause libpng12 to be used
-# the compat library is not being built do nothing.
 install-exec-hook:
 	cd $(DESTDIR)$(bindir); rm -f libpng-config
 	cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
-	@if test -n "@compatlib@"; then\
+	@set -x;\
-		set -x;\
+	cd $(DESTDIR)$(libdir);\
-		cd $(DESTDIR)$(libdir);\
+	for ext in a la so; do\
-		for ext in a la so; do\
+		rm -f libpng.$$ext;\
-			rm -f libpng.$$ext;\
+		$(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
-			$(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
+	done
-		done;\
-	fi
 
 uninstall-hook:
 	cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h

Makefile.in

@@ -1258,19 +1258,16 @@ install-data-hook:
 	cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc
 	cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
 
-# do evil things to libpng to cause libpng12 to be used, if
+# do evil things to libpng to cause libpng12 to be used
-# the compat library is not being built do nothing.
 install-exec-hook:
 	cd $(DESTDIR)$(bindir); rm -f libpng-config
 	cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
-	@if test -n "@compatlib@"; then\
+	@set -x;\
-		set -x;\
+	cd $(DESTDIR)$(libdir);\
-		cd $(DESTDIR)$(libdir);\
+	for ext in a la so; do\
-		for ext in a la so; do\
+		rm -f libpng.$$ext;\
-			rm -f libpng.$$ext;\
+		$(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
-			$(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
+	done
-		done;\
-	fi
 
 uninstall-hook:
 	cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h

README

@@ -1,4 +1,4 @@
-README for libpng version 1.2.10rc1 - April 19, 2006 (shared library 12.0)
+README for libpng version 1.2.10 - April 23, 2006 (shared library 12.0)
 See the note about version numbers near the top of png.h
 
 See INSTALL for instructions on how to install libpng.
@@ -190,11 +190,11 @@ Files in this distribution:
        descrip.mms      =>  VMS makefile for MMS or MMK
        makefile.std     =>  Generic UNIX makefile (cc, creates static libpng.a)
        makefile.elf     =>  Linux/ELF makefile symbol versioning,
-                            gcc, creates libpng12.so.0.1.2.10rc1)
+                            gcc, creates libpng12.so.0.1.2.10)
        makefile.linux   =>  Linux/ELF makefile
-                            (gcc, creates libpng12.so.0.1.2.10rc1)
+                            (gcc, creates libpng12.so.0.1.2.10)
        makefile.gcmmx   =>  Linux/ELF makefile
-                            (gcc, creates libpng12.so.0.1.2.10rc1,
+                            (gcc, creates libpng12.so.0.1.2.10,
                             uses assembler code tuned for Intel MMX platform)
        makefile.gcc     =>  Generic makefile (gcc, creates static libpng.a)
        makefile.knr     =>  Archaic UNIX Makefile that converts files with
@@ -216,12 +216,12 @@ Files in this distribution:
        makefile.openbsd =>  OpenBSD makefile
        makefile.sgi     =>  Silicon Graphics IRIX (cc, creates static lib)
        makefile.sggcc   =>  Silicon Graphics
-                            (gcc, creates libpng12.so.0.1.2.10rc1)
+                            (gcc, creates libpng12.so.0.1.2.10)
        makefile.sunos   =>  Sun makefile
        makefile.solaris =>  Solaris 2.X makefile
-                            (gcc, creates libpng12.so.0.1.2.10rc1)
+                            (gcc, creates libpng12.so.0.1.2.10)
        makefile.so9     =>  Solaris 9 makefile
-                            (gcc, creates libpng12.so.0.1.2.10rc1)
+                            (gcc, creates libpng12.so.0.1.2.10)
        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

Y2KINFO

@@ -1,13 +1,13 @@
    Y2K compliance in libpng:
    =========================
 
-      April 19, 2006
+      April 23, 2006
 
       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.2.10rc1 are Y2K compliant.  It is my belief that earlier
+      upward through 1.2.10 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

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libpng 1.2.10rc1.
+# Generated by GNU Autoconf 2.59 for libpng 1.2.10.
 #
 # Report bugs to <png-mng-implement@lists.sourceforge.net>.
 #
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='libpng'
 PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.2.10rc1'
+PACKAGE_VERSION='1.2.10'
-PACKAGE_STRING='libpng 1.2.10rc1'
+PACKAGE_STRING='libpng 1.2.10'
 PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
 
 ac_unique_file="pngget.c"
@@ -954,7 +954,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.2.10rc1 to adapt to many kinds of systems.
+\`configure' configures libpng 1.2.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1020,7 +1020,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libpng 1.2.10rc1:";;
+     short | recursive ) echo "Configuration of libpng 1.2.10:";;
    esac
   cat <<\_ACEOF
 
@@ -1167,7 +1167,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-libpng configure 1.2.10rc1
+libpng configure 1.2.10
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1181,7 +1181,7 @@ cat >&5 <<_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.2.10rc1, which was
+It was created by libpng $as_me 1.2.10, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1824,7 +1824,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libpng'
- VERSION='1.2.10rc1'
+ VERSION='1.2.10'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1979,7 +1979,7 @@ fi
 
 
 
-PNGLIB_VERSION=1.2.10rc1
+PNGLIB_VERSION=1.2.10
 PNGLIB_MAJOR=12
 PNGLIB_MINOR=10
 
@@ -20185,7 +20185,7 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG -DPNG_NO_ASSEMBLER_CODE
+LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG\ -DPNG_NO_ASSEMBLER_CODE
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 if test "$LIBPNG_DEFINES"; then
@@ -20209,8 +20209,8 @@ else
     have_ld_version_script=no
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
-    { echo "$as_me:$LINENO: WARNING: *** You may want to rerun configure using --with-gnu-ld to enable versioned symbols." >&5
+    { echo "$as_me:$LINENO: WARNING: *** You have not enabled versioned symbols." >&5
-echo "$as_me: WARNING: *** You may want to rerun configure using --with-gnu-ld to enable versioned symbols." >&2;}
+echo "$as_me: WARNING: *** You have not enabled versioned symbols." >&2;}
 fi
 
 
@@ -20681,7 +20681,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by libpng $as_me 1.2.10rc1, which was
+This file was extended by libpng $as_me 1.2.10, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20744,7 +20744,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-libpng config.status 1.2.10rc1
+libpng config.status 1.2.10
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

configure.ac

@@ -18,12 +18,12 @@ AC_PREREQ(2.59)
 
 dnl Version number stuff here:
 
-AC_INIT([libpng], [1.2.10rc1], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.2.10], [png-mng-implement@lists.sourceforge.net])
 AM_INIT_AUTOMAKE
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE
 
-PNGLIB_VERSION=1.2.10rc1
+PNGLIB_VERSION=1.2.10
 PNGLIB_MAJOR=12
 PNGLIB_MINOR=10
 
@@ -63,7 +63,7 @@ AC_TRY_COMPILE(
   [#include "pnggccrd.c"],
   [return 0;],
   LIBPNG_DEFINES=,
-  LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG -DPNG_NO_ASSEMBLER_CODE)
+  LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG\ -DPNG_NO_ASSEMBLER_CODE)
 if test "$LIBPNG_DEFINES"; then
     AC_MSG_RESULT(no)
 else
@@ -80,7 +80,7 @@ if test "$GLD"; then
 else
     have_ld_version_script=no
     AC_MSG_RESULT(no)
-    AC_MSG_WARN(*** You may want to rerun configure using --with-gnu-ld to enable versioned symbols.)
+    AC_MSG_WARN(*** You have not enabled versioned symbols.)
 fi
 AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
 

contrib/pngminus/README

@@ -20,7 +20,7 @@ Soon after the creation of PNG in 1995, the need was felt for a set of
 pnmtopng / pngtopnm utilities. Independantly Alexander Lehmann and I
 (Willem van Schaik) started such a project. Luckily we discovered this
 and merged the two together into pnmtopng.tar.gz, which is available
-from a/o ftp://swrinde.nde.swri.edu/pub/png/.
+from a/o ftp://ftp.simplesystems.org/pub/libpng/png/.
 
 These two utilities have many, many options and make use of most of the
 features of PNG, like gamma, alpha, sbit, text-chunks, etc. This makes

libpng.3

@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "April 19, 2006"
+.TH LIBPNG 3 "April 23, 2006"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10rc1
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10
 .SH SYNOPSIS
 \fI\fB
 
@@ -821,7 +821,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.2.10rc1 - April 19, 2006
+ libpng version 1.2.10 - April 23, 2006
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -2422,6 +2422,14 @@ Libpng section below.
 
     png_init_io(png_ptr, fp);
 
+If you are embedding your PNG into a datastream such as MNG, and don't
+want libpng to write the 8-byte signature, or if you have already
+written the signature in your application, use
+
+    png_set_sig_bytes(png_ptr, 8);
+
+to inform libpng that it should not write a signature.
+
 .SS Write callbacks
 
 At this point, you can set up a callback function that will be
@@ -3730,13 +3738,13 @@ application:
 
 .SH IX. Y2K Compliance in libpng
 
-April 19, 2006
+April 23, 2006
 
 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.2.10rc1 are Y2K compliant.  It is my belief that earlier
+upward through 1.2.10 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
@@ -3894,6 +3902,8 @@ the first widely used release:
  1.2.9rc1            13    10209  12.so.0.9[.0]
  1.2.9               13    10209  12.so.0.9[.0]
  1.2.10beta1-8       13    10210  12.so.0.10[.0]
+ 1.2.10rc1-3         13    10210  12.so.0.10[.0]
+ 1.2.10              13    10210  12.so.0.10[.0]
 
 Henceforth the source version will match the shared-library minor
 and patch numbers; the shared-library major version number will be
@@ -3949,7 +3959,7 @@ possible without all of you.
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.2.10rc1 - April 19, 2006:
+Libpng version 1.2.10 - April 23, 2006:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
 
@@ -3970,7 +3980,7 @@ included in the libpng distribution, the latter shall prevail.)
 If you modify libpng you may insert additional notices immediately following
 this sentence.
 
-libpng versions 1.2.6, August 15, 2004, through 1.2.10rc1, April 19, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.10, April 23, 2006, are
 Copyright (c) 2004-2006 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
@@ -4069,7 +4079,7 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-April 19, 2006
+April 23, 2006
 
 .\" end of man page
 

libpng.txt

@@ -1,6 +1,6 @@
 libpng.txt - A description on how to use and modify libpng
 
- libpng version 1.2.10rc1 - April 19, 2006
+ libpng version 1.2.10 - April 23, 2006
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -1601,6 +1601,14 @@ Libpng section below.
 
     png_init_io(png_ptr, fp);
 
+If you are embedding your PNG into a datastream such as MNG, and don't
+want libpng to write the 8-byte signature, or if you have already
+written the signature in your application, use
+
+    png_set_sig_bytes(png_ptr, 8);
+
+to inform libpng that it should not write a signature.
+
 Write callbacks
 
 At this point, you can set up a callback function that will be
@@ -2909,13 +2917,13 @@ application:
 
 IX. Y2K Compliance in libpng
 
-April 19, 2006
+April 23, 2006
 
 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.2.10rc1 are Y2K compliant.  It is my belief that earlier
+upward through 1.2.10 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

libpngpf.3

@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "April 19, 2006"
+.TH LIBPNGPF 3 "April 23, 2006"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10rc1
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10
 (private functions)
 .SH SYNOPSIS
 \fB#include <png.h>\fP

png.5

@@ -1,4 +1,4 @@
-.TH PNG 5 "April 19, 2006"
+.TH PNG 5 "April 23, 2006"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION

png.c

@@ -13,7 +13,7 @@
 #include "png.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_10rc1 Your_png_h_is_not_version_1_2_10rc1;
+typedef version_1_2_10 Your_png_h_is_not_version_1_2_10;
 
 /* Version information for C files.  This had better match the version
  * string defined in png.h.  */
@@ -693,7 +693,7 @@ png_charp PNGAPI
 png_get_copyright(png_structp png_ptr)
 {
    if (&png_ptr != NULL)  /* silence compiler warning about unused png_ptr */
-   return ((png_charp) "\n libpng version 1.2.10rc1 - April 19, 2006\n\
+   return ((png_charp) "\n libpng version 1.2.10 - April 23, 2006\n\
    Copyright (c) 1998-2006 Glenn Randers-Pehrson\n\
    Copyright (c) 1996-1997 Andreas Dilger\n\
    Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");

png.h

@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.2.10rc1 - April 19, 2006
+ * libpng version 1.2.10 - April 23, 2006
  * Copyright (c) 1998-2006 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.)
@@ -9,7 +9,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.2.10rc1 - April 19, 2006: Glenn
+ *  libpng versions 0.97, January 1998, through 1.2.10 - April 23, 2006: Glenn
  *  See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -117,6 +117,8 @@
  *    1.2.9rc1                13    10209  12.so.0.9[.0]
  *    1.2.9                   13    10209  12.so.0.9[.0]
  *    1.2.10beta1-8           13    10210  12.so.0.10[.0]
+ *    1.2.10rc1-3             13    10210  12.so.0.10[.0]
+ *    1.2.10                  13    10210  12.so.0.10[.0]
  *
  *    Henceforth the source version will match the shared-library major
  *    and minor numbers; the shared-library major version number will be
@@ -146,7 +148,7 @@
  * If you modify libpng you may insert additional notices immediately following
  * this sentence.
  *
- * libpng versions 1.2.6, August 15, 2004, through 1.2.10rc1, April 19, 2006, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.10, April 23, 2006, are
  * Copyright (c) 2004, 2006 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:
@@ -258,13 +260,13 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    April 19, 2006
+ *    April 23, 2006
  *
  *    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.2.10rc1 are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.2.10 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
@@ -320,9 +322,9 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.10rc1"
+#define PNG_LIBPNG_VER_STRING "1.2.10"
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.2.10rc1 - April 19, 2006 (header)\n"
+   " libpng version 1.2.10 - April 23, 2006 (header)\n"
 
 #define PNG_LIBPNG_VER_SONUM   0
 #define PNG_LIBPNG_VER_DLLNUM  13
@@ -334,7 +336,7 @@
 /* This should match the numeric part of the final component of
  * PNG_LIBPNG_VER_STRING, omitting any leading zero: */
 
-#define PNG_LIBPNG_VER_BUILD  1
+#define PNG_LIBPNG_VER_BUILD  0
 
 /* Release Status */
 #define PNG_LIBPNG_BUILD_ALPHA    1
@@ -351,7 +353,7 @@
 #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
                                        PNG_LIBPNG_BUILD_PRIVATE */
 
-#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC
+#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
 
 /* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
  * We must not include leading zeros.
@@ -461,7 +463,7 @@ PNG_EXPORT_VAR (const int FARDATA) png_pass_ystart[7];
 PNG_EXPORT_VAR (const int FARDATA) png_pass_yinc[7];
 PNG_EXPORT_VAR (const int FARDATA) png_pass_mask[7];
 PNG_EXPORT_VAR (const int FARDATA) png_pass_dsp_mask[7];
-#ifdef PNG_HAVE_ASSEMBLER_COMBINE_ROW
+#ifdef PNG_USE_PNGGCCRD
 PNG_EXPORT_VAR (const int FARDATA) png_pass_width[7];
 #endif
 /* This isn't currently used.  If you need it, see png.c for more details.
@@ -1364,7 +1366,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_2_10rc1;
+typedef png_structp version_1_2_10;
 
 typedef png_struct FAR * FAR * png_structpp;
 

pngconf.h

@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.2.10rc1 - April 19, 2006
+ * libpng version 1.2.10 - April 23, 2006
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2005 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

pngtest.c

@@ -1549,4 +1549,4 @@ main(int argc, char *argv[])
 }
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_10rc1 your_png_h_is_not_version_1_2_10rc1;
+typedef version_1_2_10 your_png_h_is_not_version_1_2_10;

scripts/libpng-config-head.in

@@ -8,7 +8,7 @@
 
 # Modeled after libxml-config.
 
-version=1.2.10rc1
+version=1.2.10
 prefix=""
 libdir=""
 libs=""

scripts/makefile.32sunu

@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.10rc1
+PNGMIN = 1.2.10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.64sunu

@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.10rc1
+PNGMIN = 1.2.10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.aix

@@ -20,7 +20,7 @@ LN_SF = ln -f -s
 
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.10rc1
+PNGMIN = 1.2.10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 prefix=/usr/local

scripts/makefile.beos

@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.10rc1
+PNGMIN = 1.2.10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.cygwin

@@ -80,7 +80,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
 LIBNAME = libpng12
 PNGMAJ = 0
 CYGDLL = 12
-PNGMIN = 1.2.10rc1
+PNGMIN = 1.2.10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 SHAREDLIB=cygpng$(CYGDLL).dll

scripts/makefile.darwin

@@ -19,7 +19,7 @@ ZLIBINC=../zlib
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.10rc1
+PNGMIN = 1.2.10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.dec

@@ -5,7 +5,7 @@
 
 # Library name:
 PNGMAJ = 0
-PNGMIN = 1.2.10rc1
+PNGMIN = 1.2.10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 

scripts/makefile.elf

@@ -12,7 +12,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.10rc1
+PNGMIN = 1.2.10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.gcmmx

@@ -16,7 +16,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.10rc1
+PNGMIN = 1.2.10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.hp64

@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.10rc1
+PNGMIN = 1.2.10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.hpgcc

@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.10rc1
+PNGMIN = 1.2.10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.hpux

@@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.10rc1
+PNGMIN = 1.2.10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.linux

@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.10rc1
+PNGMIN = 1.2.10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.mingw

@@ -76,7 +76,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
 LIBNAME = libpng12
 PNGMAJ = 0
 MINGDLL = 12
-PNGMIN = 1.2.10rc1
+PNGMIN = 1.2.10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 SHAREDLIB=libpng$(MINGDLL).dll

scripts/makefile.ne12bsd

@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
 
 LIB=	png12
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.2.10rc1
+SHLIB_MINOR=	1.2.10
 SRCS=	pnggccrd.c 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

scripts/makefile.netbsd

@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng
 
 LIB=	png
 SHLIB_MAJOR=	3
-SHLIB_MINOR=	1.2.10rc1
+SHLIB_MINOR=	1.2.10
 SRCS=	pnggccrd.c 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

scripts/makefile.openbsd

@@ -7,7 +7,7 @@ LIBDIR=	${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat
 
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.2.10rc1
+SHLIB_MINOR=	1.2.10
 
 LIB=	png
 SRCS=	png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \

scripts/makefile.sco

@@ -9,7 +9,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.10rc1
+PNGMIN = 1.2.10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.sggcc

@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.10rc1
+PNGMIN = 1.2.10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.sgi

@@ -6,7 +6,7 @@
 # Library name:
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.10rc1
+PNGMIN = 1.2.10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/makefile.so9

@@ -8,7 +8,7 @@
 
 # Library name:
 PNGMAJ = 0
-PNGMIN = 1.2.10rc1
+PNGMIN = 1.2.10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 

scripts/makefile.solaris

@@ -8,7 +8,7 @@
 # Library name:
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.10rc1
+PNGMIN = 1.2.10
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # Shared library names:

scripts/pngos2.def

@@ -2,7 +2,7 @@
 ; PNG.LIB module definition file for OS/2
 ;----------------------------------------
 
-; Version 1.2.10rc1
+; Version 1.2.10
 
 LIBRARY		PNG
 DESCRIPTION	"PNG image compression library for OS/2"
@@ -88,7 +88,7 @@ EXPORTS
   png_read_end
   png_read_image
   png_read_info
-  png_read_init ; deprecated
+; png_read_init ; deprecated
   png_read_png
   png_read_row
   png_read_rows
@@ -118,7 +118,7 @@ EXPORTS
   png_set_gAMA
   png_set_gAMA_fixed
   png_set_gamma
-  png_set_gray_1_2_4_to_8 ; deprecated as of libpng-1.2.9
+; png_set_gray_1_2_4_to_8 ; deprecated as of libpng-1.2.9
   png_set_gray_to_rgb
   png_set_hIST
   png_set_iCCP
@@ -173,7 +173,7 @@ EXPORTS
   png_write_image
   png_write_info
   png_write_info_before_PLTE
-  png_write_init ; deprecated
+; png_write_init ; deprecated
   png_write_png
   png_write_row
   png_write_rows

scripts/pngw32.def

@@ -5,7 +5,7 @@
 LIBRARY
 
 EXPORTS
-;Version 1.2.10rc1
+;Version 1.2.10
   png_build_grayscale_palette  @1
   png_check_sig        @2
   png_chunk_error      @3
@@ -114,7 +114,8 @@ EXPORTS
   png_set_gAMA    @104
   png_set_gAMA_fixed  @105
   png_set_gamma    @106
-  png_set_gray_1_2_4_to_8  @107 ; deprecated
+; png_set_gray_1_2_4_to_8 is deprecated
+  png_set_gray_1_2_4_to_8  @107
   png_set_gray_to_rgb  @108
   png_set_hIST    @109
   png_set_iCCP    @110
@@ -178,14 +179,14 @@ EXPORTS
   png_read_init_2    @166
   png_write_init_2    @167
   png_access_version_number  @168
-;  png_sig_bytes    @169
+  png_sig_bytes    @169
-;  png_libpng_ver    @170
+  png_libpng_ver    @170
   png_init_io    @171
   png_convert_to_rfc1123     @172
   png_set_invalid  @173
 ; Added at version 1.0.12
 ; For compatibility with 1.0.7-1.0.11
-  png_info_init @174
+; png_info_init @174
   png_read_init_3    @175
   png_write_init_3    @176
   png_info_init_3 @177
@@ -201,13 +202,13 @@ EXPORTS
   png_permit_mng_features  @184
 ; MMX support
   png_mmx_support  @185
-  png_get_mmx_flagmask  @186
+; png_get_mmx_flagmask  @186
   png_get_asm_flagmask  @187
   png_get_asm_flags  @188
-  png_get_mmx_bitdepth_threshold  @189
+; png_get_mmx_bitdepth_threshold  @189
-  png_get_mmx_rowbytes_threshold  @190
+; png_get_mmx_rowbytes_threshold  @190
   png_set_asm_flags  @191
-  png_init_mmx_flags  @192
+; png_init_mmx_flags  @192
 ; Strip error numbers
   png_set_strip_error_numbers @193
 ; Added at version 1.2.2