Binary files libpng-1.2.24/contrib/gregbook/toucan.png and libpng-1.2.25beta01/contrib/gregbook/toucan.png differ
diff -ru4N libpng-1.2.24/png.h libpng-1.2.25beta01/png.h
--- libpng-1.2.24/png.h	Fri Dec 14 10:22:29 2007
+++ libpng-1.2.25beta01/png.h	Wed Jan  9 10:58:17 2008
@@ -1,9 +1,9 @@
 
 /* png.h - header file for PNG reference library
  *
  * libpng version %VER% - %DATE%
- * Copyright (c) 1998-2007 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2008 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.)
  *
  * Authors and maintainers:
@@ -174,8 +174,9 @@
  *    1.2.23                  13    10223  12.so.0.23[.0]
  *    1.2.24beta01-02         13    10224  12.so.0.24[.0]
  *    1.2.24rc01              13    10224  12.so.0.24[.0]
  *    1.2.24                  13    10224  12.so.0.24[.0]
+ *    1.2.25beta01            13    10225  12.so.0.25[.0]
  *
  *    Henceforth the source version will match the shared-library major
  *    and minor numbers; the shared-library major version number will be
  *    used for changes in backward compatibility, as it is intended.  The
@@ -204,9 +205,9 @@
  * If you modify libpng you may insert additional notices immediately following
  * this sentence.
  *
  * libpng versions 1.2.6, August 15, 2004, through %VER%, %DATE%, are
- * Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
+ * Copyright (c) 2004, 2006-2008 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:
  *
  *    Cosmin Truta
diff -ru4N libpng-1.2.24/pngpread.c libpng-1.2.25beta01/pngpread.c
--- libpng-1.2.24/pngpread.c	Fri Dec 14 10:22:30 2007
+++ libpng-1.2.25beta01/pngpread.c	Wed Jan  9 10:58:17 2008
@@ -1,10 +1,10 @@
 
 /* pngpread.c - read a png file in push mode
  *
- * Last changed in libpng 1.2.23 [November 6, 2007]
+ * Last changed in libpng 1.2.25 [%DATE%]
  * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 1998-2007 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2008 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.)
  */
 
@@ -1516,11 +1516,11 @@
             png_set_unknown_chunks(png_ptr, info_ptr,
                &png_ptr->unknown_chunk, 1);
          }
       }
-#else
-      png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
+      else
 #endif
+        png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
       png_free(png_ptr, png_ptr->unknown_chunk.data);
       png_ptr->unknown_chunk.data = NULL;
    }
    else
diff -ru4N libpng-1.2.24/pngrutil.c libpng-1.2.25beta01/pngrutil.c
--- libpng-1.2.24/pngrutil.c	Fri Dec 14 10:22:31 2007
+++ libpng-1.2.25beta01/pngrutil.c	Wed Jan  9 10:58:17 2008
@@ -1,10 +1,10 @@
 
 /* pngrutil.c - utilities to read a PNG file
  *
- * Last changed in libpng 1.2.23 [November 6, 2007]
+ * Last changed in libpng 1.2.25 [%DATE%]
  * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 1998-2007 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2008 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.)
  *
  * This file contains routines that are only called from within
@@ -2248,11 +2248,11 @@
              png_set_unknown_chunks(png_ptr, info_ptr,
                &png_ptr->unknown_chunk, 1);
           }
        }
-#else
-       png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
+       else
 #endif
+         png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
        png_free(png_ptr, png_ptr->unknown_chunk.data);
        png_ptr->unknown_chunk.data = NULL;
    }
    else