diff -ru4NwbB libpng-1.2.41/contrib/pngminim/decoder/makefile libpng-1.2.42rc05/contrib/pngminim/decoder/makefile
--- libpng-1.2.41/contrib/pngminim/decoder/makefile	2009-12-03 10:56:55.449706468 -0600
+++ libpng-1.2.42rc05/contrib/pngminim/decoder/makefile	2010-01-01 18:27:15.849628356 -0600
@@ -6,9 +6,9 @@
 LD=$(CC)
 
 RM=rm -f
 
-CFLAGS=-DPNG_CONFIGURE_LIBPNG -DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP \
+CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP \
        -DdeflateParams\(a,b,c\)=Z_OK -I. -O1
 
 C=.c
 O=.o
diff -ru4NwbB libpng-1.2.41/contrib/pngminim/encoder/makefile libpng-1.2.42rc05/contrib/pngminim/encoder/makefile
--- libpng-1.2.41/contrib/pngminim/encoder/makefile	2009-12-03 10:56:55.494063466 -0600
+++ libpng-1.2.42rc05/contrib/pngminim/encoder/makefile	2010-01-01 18:27:15.892351193 -0600
@@ -6,9 +6,9 @@
 LD=$(CC)
 
 RM=rm -f
 
-CFLAGS=-DPNG_CONFIGURE_LIBPNG -DPNG_USER_CONFIG -DNO_GZIP -I. -O1
+CFLAGS=-DPNG_USER_CONFIG -DNO_GZIP -I. -O1
 
 C=.c
 O=.o
 L=.a
diff -ru4NwbB libpng-1.2.41/contrib/pngminim/preader/makefile libpng-1.2.42rc05/contrib/pngminim/preader/makefile
--- libpng-1.2.41/contrib/pngminim/preader/makefile	2009-12-03 10:56:55.530094843 -0600
+++ libpng-1.2.42rc05/contrib/pngminim/preader/makefile	2010-01-01 18:27:15.927028884 -0600
@@ -22,9 +22,9 @@
 
 #LIBS = $(XLIB)
 LIBS = $(XLIB) -lm                      #platforms that need libm
 
-CFLAGS=-DPNG_CONFIGURE_LIBPNG -DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP \
+CFLAGS=-DPNG_USER_CONFIG -DNO_GZCOMPRESS -DNO_GZIP \
        -DdeflateParams\(a,b,c\)=Z_OK -I. $(XINC) -O1
 
 C=.c
 O=.o
diff -ru4NwbB libpng-1.2.41/example.c libpng-1.2.42rc05/example.c
--- libpng-1.2.41/example.c	2009-12-03 10:56:54.626415683 -0600
+++ libpng-1.2.42rc05/example.c	2010-01-01 18:27:15.090401163 -0600
@@ -3,9 +3,9 @@
 
 /* example.c - an example of using libpng
  * Last changed in libpng 1.2.37 [June 4, 2009]
  * This file has been placed in the public domain by the authors.
- * Maintained 1998-2009 Glenn Randers-Pehrson
+ * Maintained 1998-2010 Glenn Randers-Pehrson
  * Maintained 1996, 1997 Andreas Dilger)
  * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  */
 
diff -ru4NwbB libpng-1.2.41/png.c libpng-1.2.42rc05/png.c
--- libpng-1.2.41/png.c	2009-12-03 10:56:54.634368684 -0600
+++ libpng-1.2.42rc05/png.c	2010-01-01 18:27:15.098400187 -0600
@@ -1,9 +1,9 @@
 
 /* png.c - location for general purpose libpng functions
  *
- * Last changed in libpng 1.2.41 [January 2, 2010]
- * Copyright (c) 1998-2009 Glenn Randers-Pehrson
+ * Last changed in libpng 1.2.42 [January 2, 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.)
  *
  * This code is released under the libpng license.
@@ -723,15 +723,15 @@
 #else
 #ifdef __STDC__
    return ((png_charp) PNG_STRING_NEWLINE \
      "libpng version 1.2.42rc05 - January 2, 2010" PNG_STRING_NEWLINE \
-     "Copyright (c) 1998-2009 Glenn Randers-Pehrson" 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.2.42rc05 - January 2, 2010\
-      Copyright (c) 1998-2009 Glenn Randers-Pehrson\
+      Copyright (c) 1998-2010 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");
 #endif
 #endif
diff -ru4NwbB libpng-1.2.41/png.h libpng-1.2.42rc05/png.h
--- libpng-1.2.41/png.h	2009-12-03 10:56:54.609778519 -0600
+++ libpng-1.2.42rc05/png.h	2010-01-01 18:27:15.073763020 -0600
@@ -1,8 +1,8 @@
 /* png.h - header file for PNG reference library
  *
  * libpng version 1.2.42rc05 - January 2, 2010
- * Copyright (c) 1998-2009 Glenn Randers-Pehrson
+ * 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.)
  *
  * This code is released under the libpng license (See LICENSE, below)
@@ -249,8 +249,12 @@
  *    1.0.51rc01              10    10051  10.so.0.51[.0]
  *    1.2.41rc01-03           13    10241  12.so.0.41[.0]
  *    1.0.51                  10    10051  10.so.0.51[.0]
  *    1.2.41                  13    10241  12.so.0.41[.0]
+ *    1.2.42beta01-02         13    10242  12.so.0.42[.0]
+ *    1.2.42rc01-05           13    10242  12.so.0.42[.0]
+ *    1.0.52                  10    10052  10.so.0.52[.0]
+ *    1.2.42                  13    10242  12.so.0.42[.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
@@ -281,9 +285,9 @@
  *
  * This code is released under the libpng license.
  *
  * libpng versions 1.2.6, August 15, 2004, through 1.2.42rc05, January 2, 2010, are
- * Copyright (c) 2004, 2006-2009 Glenn Randers-Pehrson, and 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:
  *
  *    Cosmin Truta
@@ -2168,12 +2172,12 @@
    png_voidp ptr));
 #endif
 
 extern PNG_EXPORT(png_voidp,png_memcpy_check) PNGARG((png_structp png_ptr,
-   png_voidp s1, png_voidp s2, png_uint_32 size));
+   png_voidp s1, png_voidp s2, png_uint_32 size)) PNG_DEPRECATED;
 
 extern PNG_EXPORT(png_voidp,png_memset_check) PNGARG((png_structp png_ptr,
-   png_voidp s1, int value, png_uint_32 size));
+   png_voidp s1, int value, png_uint_32 size)) PNG_DEPRECATED;
 
 #if defined(USE_FAR_KEYWORD)  /* memory model conversion function */
 extern void *png_far_to_near PNGARG((png_structp png_ptr,png_voidp ptr,
    int check));
diff -ru4NwbB libpng-1.2.41/pngconf.h libpng-1.2.42rc05/pngconf.h
--- libpng-1.2.41/pngconf.h	2009-12-03 10:56:54.619090780 -0600
+++ libpng-1.2.42rc05/pngconf.h	2010-01-01 18:27:15.082912596 -0600
@@ -1,9 +1,9 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
  * libpng version 1.2.42rc05 - January 2, 2010
- * Copyright (c) 1998-2009 Glenn Randers-Pehrson
+ * 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.)
  *
  * This code is released under the libpng license.
@@ -755,9 +755,8 @@
 #endif
 
 #endif /* PNG_WRITE_SUPPORTED */
 
-#define PNG_NO_ERROR_NUMBERS
 #ifndef PNG_1_0_X
 #  ifndef PNG_NO_ERROR_NUMBERS
 #    define PNG_ERROR_NUMBERS_SUPPORTED
 #  endif
diff -ru4NwbB libpng-1.2.41/pngerror.c libpng-1.2.42rc05/pngerror.c
--- libpng-1.2.41/pngerror.c	2009-12-03 10:56:54.639831703 -0600
+++ libpng-1.2.42rc05/pngerror.c	2010-01-01 18:27:15.103953145 -0600
@@ -1,8 +1,8 @@
 
 /* pngerror.c - stub functions for i/o and memory allocation
  *
- * Last changed in libpng 1.2.41 [January 2, 2010]
+ * Last changed in libpng 1.2.41 [December 3, 2009]
  * Copyright (c) 1998-2009 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
diff -ru4NwbB libpng-1.2.41/pngget.c libpng-1.2.42rc05/pngget.c
--- libpng-1.2.41/pngget.c	2009-12-03 10:56:54.651566220 -0600
+++ libpng-1.2.42rc05/pngget.c	2010-01-01 18:27:15.115773580 -0600
@@ -1,8 +1,8 @@
 
 /* pngget.c - retrieval of values from info struct
  *
- * Last changed in libpng 1.2.41 [January 2, 2010]
+ * Last changed in libpng 1.2.41 [December 3, 2009]
  * Copyright (c) 1998-2009 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
diff -ru4NwbB libpng-1.2.41/pngmem.c libpng-1.2.42rc05/pngmem.c
--- libpng-1.2.41/pngmem.c	2009-12-03 10:56:54.657647681 -0600
+++ libpng-1.2.42rc05/pngmem.c	2010-01-01 18:27:15.122108435 -0600
@@ -1,8 +1,8 @@
 
 /* pngmem.c - stub functions for memory allocation
  *
- * Last changed in libpng 1.2.41 [January 2, 2010]
+ * Last changed in libpng 1.2.41 [December 3, 2009]
  * Copyright (c) 1998-2009 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
diff -ru4NwbB libpng-1.2.41/pngpread.c libpng-1.2.42rc05/pngpread.c
--- libpng-1.2.41/pngpread.c	2009-12-03 10:56:54.665948281 -0600
+++ libpng-1.2.42rc05/pngpread.c	2010-01-01 18:27:15.130609338 -0600
@@ -1,8 +1,8 @@
 
 /* pngpread.c - read a png file in push mode
  *
- * Last changed in libpng 1.2.41 [January 2, 2010]
+ * Last changed in libpng 1.2.42 [January 2, 2010]
  * Copyright (c) 1998-2009 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
diff -ru4NwbB libpng-1.2.41/pngread.c libpng-1.2.42rc05/pngread.c
--- libpng-1.2.41/pngread.c	2009-12-03 10:56:54.674746026 -0600
+++ libpng-1.2.42rc05/pngread.c	2010-01-01 18:27:15.139304601 -0600
@@ -1,8 +1,8 @@
 
 /* pngread.c - read a PNG file
  *
- * Last changed in libpng 1.2.41 [January 2, 2010]
+ * Last changed in libpng 1.2.41 [December 3, 2009]
  * Copyright (c) 1998-2009 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
diff -ru4NwbB libpng-1.2.41/pngrio.c libpng-1.2.42rc05/pngrio.c
--- libpng-1.2.41/pngrio.c	2009-12-03 10:56:54.679792080 -0600
+++ libpng-1.2.42rc05/pngrio.c	2010-01-01 18:27:15.144207966 -0600
@@ -1,8 +1,8 @@
 
 /* pngrio.c - functions for data input
  *
- * Last changed in libpng 1.2.41 [January 2, 2010]
+ * Last changed in libpng 1.2.41 [December 3, 2009]
  * Copyright (c) 1998-2009 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
diff -ru4NwbB libpng-1.2.41/pngrtran.c libpng-1.2.42rc05/pngrtran.c
--- libpng-1.2.41/pngrtran.c	2009-12-03 10:56:54.695130145 -0600
+++ libpng-1.2.42rc05/pngrtran.c	2010-01-01 18:27:15.159600847 -0600
@@ -1,9 +1,9 @@
 
 /* pngrtran.c - transforms the data in a row for PNG readers
  *
- * Last changed in libpng 1.2.41 [January 2, 2010]
- * Copyright (c) 1998-2009 Glenn Randers-Pehrson
+ * Last changed in libpng 1.2.42 [January 2, 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.)
  *
  * This code is released under the libpng license.
@@ -966,21 +967,21 @@
                }
                else
                {
                   back.red = (png_byte)(pow(
-                     (double)png_ptr->background.red/255, gs) * 255.0 + .5);
+                     (double)png_ptr->background.red/%F255%, gs) * 255.0 + .5);
                   back.green = (png_byte)(pow(
-                     (double)png_ptr->background.green/255, gs) * 255.0 + .5);
+                     (double)png_ptr->background.green/%F255%, gs) * 255.0 + .5);
                   back.blue = (png_byte)(pow(
-                     (double)png_ptr->background.blue/255, gs) * 255.0 + .5);
+                     (double)png_ptr->background.blue/%F255%, gs) * 255.0 + .5);
                }
 
                back_1.red = (png_byte)(pow(
-                  (double)png_ptr->background.red/255, g) * 255.0 + .5);
+                  (double)png_ptr->background.red/%F255%, g) * 255.0 + .5);
                back_1.green = (png_byte)(pow(
-                  (double)png_ptr->background.green/255, g) * 255.0 + .5);
+                  (double)png_ptr->background.green/%F255%, g) * 255.0 + .5);
                back_1.blue = (png_byte)(pow(
-                  (double)png_ptr->background.blue/255, g) * 255.0 + .5);
+                  (double)png_ptr->background.blue/%F255%, g) * 255.0 + .5);
             }
             for (i = 0; i < num_palette; i++)
             {
                if (i < (int)png_ptr->num_trans && png_ptr->trans[i] != 0xff)
@@ -1436,13 +1437,8 @@
        !(png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
       png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1);
 #endif
 
-#ifdef PNG_READ_16_TO_8_SUPPORTED
-   if (png_ptr->transformations & PNG_16_TO_8)
-      png_do_chop(&(png_ptr->row_info), png_ptr->row_buf + 1);
-#endif
-
 #ifdef PNG_READ_BACKGROUND_SUPPORTED
    if ((png_ptr->transformations & PNG_BACKGROUND) &&
       ((png_ptr->num_trans != 0 ) ||
       (png_ptr->color_type & PNG_COLOR_MASK_ALPHA)))
@@ -1470,8 +1466,13 @@
           png_ptr->gamma_table, png_ptr->gamma_16_table,
           png_ptr->gamma_shift);
 #endif
 
+#ifdef PNG_READ_16_TO_8_SUPPORTED
+   if (png_ptr->transformations & PNG_16_TO_8)
+      png_do_chop(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
 #ifdef PNG_READ_DITHER_SUPPORTED
    if (png_ptr->transformations & PNG_DITHER)
    {
       png_do_dither((png_row_infop)&(png_ptr->row_info), png_ptr->row_buf + 1,
diff -ru4NwbB libpng-1.2.41/pngrutil.c libpng-1.2.42rc05/pngrutil.c
--- libpng-1.2.41/pngrutil.c	2009-12-03 10:56:54.707886046 -0600
+++ libpng-1.2.42rc05/pngrutil.c	2010-01-01 18:27:15.172659693 -0600
@@ -1,8 +1,8 @@
 
 /* pngrutil.c - utilities to read a PNG file
  *
- * Last changed in libpng 1.2.41 [January 2, 2010]
+ * Last changed in libpng 1.2.41 [December 3, 2009]
  * Copyright (c) 1998-2009 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.)
  *
@@ -3205,11 +3205,16 @@
    if (row_bytes + 64 > png_ptr->old_big_row_buf_size)
    {
      png_free(png_ptr, png_ptr->big_row_buf);
      if (png_ptr->interlaced)
-        png_ptr->big_row_buf = (png_bytep)png_calloc(png_ptr, row_bytes + 64);
+        png_ptr->big_row_buf = (png_bytep)png_calloc(png_ptr,
+            row_bytes + 64);
      else
-        png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes + 64);
+        png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr,
+            row_bytes + 64);
+     png_ptr->old_big_row_buf_size = row_bytes + 64;
+
+     /* Use 32 bytes of padding before and after row_buf. */
      png_ptr->row_buf = png_ptr->big_row_buf + 32;
      png_ptr->old_big_row_buf_size = row_bytes + 64;
    }
 
diff -ru4NwbB libpng-1.2.41/pngset.c libpng-1.2.42rc05/pngset.c
--- libpng-1.2.41/pngset.c	2009-12-03 10:56:54.716137312 -0600
+++ libpng-1.2.42rc05/pngset.c	2010-01-01 18:27:15.180864041 -0600
@@ -1,9 +1,9 @@
 
 /* pngset.c - storage of image information into info struct
  *
- * Last changed in libpng 1.2.41 [January 2, 2010]
- * Copyright (c) 1998-2009 Glenn Randers-Pehrson
+ * Last changed in libpng 1.2.42 [January 2, 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.)
  *
  * This code is released under the libpng license.
@@ -461,10 +461,9 @@
          return;
       }
    }
 
-   /*
-    * It may not actually be necessary to set png_ptr->palette here;
+   /* It may not actually be necessary to set png_ptr->palette here;
     * we do it for backward compatibility with the way the png_handle_tRNS
     * function used to do the allocation.
     */
 #ifdef PNG_FREE_ME_SUPPORTED
@@ -628,9 +627,10 @@
    info_ptr->iccp_proflen = proflen;
    info_ptr->iccp_name = new_iccp_name;
    info_ptr->iccp_profile = new_iccp_profile;
    /* Compression is always zero but is here so the API and info structure
-    * does not have to change if we introduce multiple compression types */
+    * does not have to change if we introduce multiple compression types
+    */
    info_ptr->iccp_compression = (png_byte)compression_type;
 #ifdef PNG_FREE_ME_SUPPORTED
    info_ptr->free_me |= PNG_FREE_ICCP;
 #endif
@@ -959,9 +959,9 @@
 #endif
 }
 #endif /* PNG_sPLT_SUPPORTED */
 
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
 void PNGAPI
 png_set_unknown_chunks(png_structp png_ptr,
    png_infop info_ptr, png_unknown_chunkp unknowns, int num_unknowns)
 {
@@ -990,10 +990,9 @@
    {
       png_unknown_chunkp to = np + info_ptr->unknown_chunks_num + i;
       png_unknown_chunkp from = unknowns + i;
 
-      png_memcpy((png_charp)to->name,
-                 (png_charp)from->name,
+      png_memcpy((png_charp)to->name, (png_charp)from->name,
                  png_sizeof(from->name));
       to->name[png_sizeof(to->name)-1] = '\0';
       to->size = from->size;
       /* Note our location in the read or write sequence */
@@ -1065,9 +1064,9 @@
    return (png_uint_32)png_ptr->mng_features_permitted;
 }
 #endif
 
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
 void PNGAPI
 png_set_keep_unknown_chunks(png_structp png_ptr, int keep, png_bytep
    chunk_list, int num_chunks)
 {
diff -ru4NwbB libpng-1.2.41/pngtest.c libpng-1.2.42rc05/pngtest.c
--- libpng-1.2.41/pngtest.c	2009-12-03 10:56:54.724887493 -0600
+++ libpng-1.2.42rc05/pngtest.c	2010-01-01 18:27:15.189772708 -0600
@@ -1,8 +1,8 @@
 
 /* pngtest.c - a simple test program to test libpng
  *
- * Last changed in libpng 1.2.41 [January 2, 2010]
+ * Last changed in libpng 1.2.41 [December 3, 2009]
  * Copyright (c) 1998-2009 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.)
  *
@@ -311,14 +311,19 @@
 #ifndef USE_FAR_KEYWORD
 static void
 pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
 {
-   png_size_t check;
+   png_size_t check = 0;
+   png_voidp io_ptr;
 
    /* fread() returns 0 on error, so it is OK to store this in a png_size_t
     * instead of an int, which is what fread() actually returns.
     */
-   READFILE((png_FILE_p)png_ptr->io_ptr, data, length, check);
+   io_ptr = png_get_io_ptr(png_ptr);
+   if (io_ptr != NULL)
+   {
+      READFILE((png_FILE_p)io_ptr, data, length, check);
+   }
 
    if (check != length)
    {
       png_error(png_ptr, "Read Error!");
@@ -456,11 +461,14 @@
 static void
 pngtest_warning(png_structp png_ptr, png_const_charp message)
 {
    PNG_CONST char *name = "UNKNOWN (ERROR!)";
-   if (png_ptr != NULL && png_ptr->error_ptr != NULL)
-      name = png_ptr->error_ptr;
+   char *test;
+   test = png_get_error_ptr(png_ptr);
+   if (test == NULL)
    fprintf(STDERR, "%s: libpng warning: %s\n", name, message);
+   else
+     fprintf(STDERR, "%s: libpng warning: %s\n", test, message);
 }
 
 /* This is the default error handling function.  Note that replacements for
  * this function MUST NOT RETURN, or the program will likely crash.  This
diff -ru4NwbB libpng-1.2.41/pngtrans.c libpng-1.2.42rc05/pngtrans.c
--- libpng-1.2.41/pngtrans.c	2009-12-03 10:56:54.731387053 -0600
+++ libpng-1.2.42rc05/pngtrans.c	2010-01-01 18:27:15.196344429 -0600
@@ -1,8 +1,8 @@
 
 /* pngtrans.c - transforms the data in a row (used by both readers and writers)
  *
- * Last changed in libpng 1.2.41 [January 2, 2010]
+ * Last changed in libpng 1.2.41 [December 3, 2009]
  * Copyright (c) 1998-2009 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
diff -ru4NwbB libpng-1.2.41/pngwio.c libpng-1.2.42rc05/pngwio.c
--- libpng-1.2.41/pngwio.c	2009-12-03 10:56:54.741067886 -0600
+++ libpng-1.2.42rc05/pngwio.c	2010-01-01 18:27:15.205763645 -0600
@@ -1,8 +1,8 @@
 
 /* pngwio.c - functions for data output
  *
- * Last changed in libpng 1.2.41 [January 2, 2010]
+ * Last changed in libpng 1.2.41 [December 3, 2009]
  * Copyright (c) 1998-2009 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
diff -ru4NwbB libpng-1.2.41/pngwrite.c libpng-1.2.42rc05/pngwrite.c
--- libpng-1.2.41/pngwrite.c	2009-12-03 10:56:54.749784095 -0600
+++ libpng-1.2.42rc05/pngwrite.c	2010-01-01 18:27:15.214516405 -0600
@@ -1,9 +1,9 @@
 
 /* pngwrite.c - general routines to write a PNG file
  *
- * Last changed in libpng 1.2.41 [January 2, 2010]
- * Copyright (c) 1998-2009 Glenn Randers-Pehrson
+ * Last changed in libpng 1.2.42 [January 2, 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.)
  *
  * This code is released under the libpng license.
@@ -414,15 +414,15 @@
     * and restored again in libpng-1.2.30, may cause some applications that
     * do not set png_ptr->output_flush_fn to crash.  If your application
     * experiences a problem, please try building libpng with
     * PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED defined, and report the event to
-    * png-mng-implement at lists.sf.net .  This kludge will be removed
-    * from libpng-1.4.0.
+    * png-mng-implement at lists.sf.net .
     */
-#if defined(PNG_WRITE_FLUSH_SUPPORTED) && \
-    defined(PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED)
+#ifdef PNG_WRITE_FLUSH_SUPPORTED
+#  ifdef PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED
    png_flush(png_ptr);
 #endif
+#endif
 }
 
 #ifdef PNG_CONVERT_tIME_SUPPORTED
 /* "tm" structure is not supported on WindowsCE */
diff -ru4NwbB libpng-1.2.41/pngwtran.c libpng-1.2.42rc05/pngwtran.c
--- libpng-1.2.41/pngwtran.c	2009-12-03 10:56:54.756343146 -0600
+++ libpng-1.2.42rc05/pngwtran.c	2010-01-01 18:27:15.220696648 -0600
@@ -1,8 +1,8 @@
 
 /* pngwtran.c - transforms the data in a row for PNG writers
  *
- * Last changed in libpng 1.2.41 [January 2, 2010]
+ * Last changed in libpng 1.2.41 [December 3, 2009]
  * Copyright (c) 1998-2009 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
diff -ru4NwbB libpng-1.2.41/pngwutil.c libpng-1.2.42rc05/pngwutil.c
--- libpng-1.2.41/pngwutil.c	2009-12-03 10:56:54.767749643 -0600
+++ libpng-1.2.42rc05/pngwutil.c	2010-01-01 18:27:15.232045348 -0600
@@ -1,8 +1,8 @@
 
 /* pngwutil.c - utilities to write a PNG file
  *
- * Last changed in libpng 1.2.41 [January 2, 2010]
+ * Last changed in libpng 1.2.41 [December 3, 2009]
  * Copyright (c) 1998-2009 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
diff -ru4NwbB libpng-1.2.41/projects/xcode/libpng.xcodeproj/project.pbxproj libpng-1.2.42rc05/projects/xcode/libpng.xcodeproj/project.pbxproj
--- libpng-1.2.41/projects/xcode/libpng.xcodeproj/project.pbxproj	2009-12-03 10:56:56.019362660 -0600
+++ libpng-1.2.42rc05/projects/xcode/libpng.xcodeproj/project.pbxproj	2010-01-01 18:27:16.316860550 -0600
@@ -221,9 +221,9 @@
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
 				DYLIB_COMPATIBILITY_VERSION = 3;
 				DYLIB_CURRENT_VERSION = 3;
-				FRAMEWORK_VERSION = 1.2.41;
+				FRAMEWORK_VERSION = 1.2.42rc05;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "@executable_path/../Frameworks";
@@ -239,9 +239,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DYLIB_COMPATIBILITY_VERSION = 3;
 				DYLIB_CURRENT_VERSION = 3;
-				FRAMEWORK_VERSION = 1.2.41;
+				FRAMEWORK_VERSION = 1.2.42rc05;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "@executable_path/../Frameworks";
diff -ru4NwbB libpng-1.2.41/scripts/makefile.darwin libpng-1.2.42rc05/scripts/makefile.darwin
--- libpng-1.2.41/scripts/makefile.darwin	2009-12-03 10:56:56.762243152 -0600
+++ libpng-1.2.42rc05/scripts/makefile.darwin	2010-01-01 18:27:16.843249462 -0600
@@ -41,9 +41,9 @@
 RANLIB=ranlib
 RM_F=/bin/rm -f
 
 # CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE
-CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -W -Wall -O -funroll-loops
+CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng%N% -lz
 
 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
diff -ru4NwbB libpng-1.2.41/scripts/makefile.netbsd libpng-1.2.42rc05/scripts/makefile.netbsd
--- libpng-1.2.41/scripts/makefile.netbsd	2009-12-03 10:56:56.944418943 -0600
+++ libpng-1.2.42rc05/scripts/makefile.netbsd	2010-01-01 18:27:17.005194783 -0600
@@ -1,20 +1,20 @@
 # makefile for libpng for NetBSD for the standard
 # make obj && make depend && make && make test
 # make includes && make install
 # Copyright (C) 2002 Patrick R.L. Welche
-# Copyright (C) 2007, 2009 Glenn Randers-Pehrson
+# Copyright (C) 2007-2009 Glenn Randers-Pehrson
 #
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
-# You should also run makefile.ne0bsd
+# You should also run makefile.ne%NN%bsd
 
 LOCALBASE?=/usr/local
 LIBDIR=	${LOCALBASE}/lib
 MANDIR= ${LOCALBASE}/man
-INCSDIR=${LOCALBASE}/include/libpng
+INCSDIR=${LOCALBASE}/include
 
 LIB=	png
 SHLIB_MAJOR=	3
 SHLIB_MINOR=	1.2.42rc05
diff -ru4NwbB libpng-1.2.41/scripts/makefile.openbsd libpng-1.2.42rc05/scripts/makefile.openbsd
--- libpng-1.2.41/scripts/makefile.openbsd	2009-12-03 10:56:56.968637324 -0600
+++ libpng-1.2.42rc05/scripts/makefile.openbsd	2010-01-01 18:27:17.027515009 -0600
@@ -1,7 +1,7 @@
 # makefile for libpng
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# Copyright (C) 2007-2008 Glenn Randers-Pehrson
+# Copyright (C) 2007-2009 Glenn Randers-Pehrson
 #
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
@@ -41,9 +41,9 @@
 		LD_LIBRARY_PATH="${.OBJDIR}" ${.OBJDIR}/pngtest
 
 beforeinstall:
 	if [ ! -d ${DESTDIR}${PREFIX}/include/libpng ]; then \
-	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include/libpng; \
+	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include; \
 	fi
 	if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
 	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
 	fi
@@ -66,9 +66,9 @@
 	@rm -f ${DESTDIR}${PREFIX}/include/png.h
 	@rm -f ${DESTDIR}${PREFIX}/include/pngconf.h
 	@rmdir ${DESTDIR}${LIBDIR}/debug 2>/dev/null || true
 	${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
-		-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include/libpng
+		-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
 	${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
 		-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
 	${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
 		-m ${NONBINMODE} ${DOCS} ${DESTDIR}${PREFIX}/share/doc/png
diff -ru4NwbB libpng-1.2.41/scripts/makefile.sco libpng-1.2.42rc05/scripts/makefile.sco
--- libpng-1.2.41/scripts/makefile.sco	2009-12-03 10:56:56.990945694 -0600
+++ libpng-1.2.42rc05/scripts/makefile.sco	2010-01-01 18:27:17.045485244 -0600
@@ -43,9 +43,9 @@
 
 CFLAGS= -dy -belf -I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng%N% -lz -lm
 
-INCPATH=$(prefix)/include/libpng
+INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
 MANPATH=$(prefix)/man
 BINPATH=$(exec_prefix)/bin