diff -ru4NwbB libpng-1.4.6/png.h libpng-1.4.7/png.h
--- libpng-1.4.6/png.h	2011-04-08 11:58:23.937816625 -0500
+++ libpng-1.4.7/png.h	2011-04-10 06:41:20.474351697 -0500
@@ -155,8 +155,10 @@
  *    1.4.5                   14    10405  14.so.14.5[.0]
  *    1.4.6beta01-07          14    10406  14.so.14.6[.0]
  *    1.4.6rc01               14    10406  14.so.14.6[.0]
  *    1.4.6                   14    10406  14.so.14.6[.0]
+ *    1.4.7rc01               14    10407  14.so.14.7[.0]
+ *    1.4.7                   14    10407  14.so.14.7[.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
diff -ru4NwbB libpng-1.4.6/pngconf.h libpng-1.4.7/pngconf.h
--- libpng-1.4.6/pngconf.h	2011-04-08 11:58:23.947467007 -0500
+++ libpng-1.4.7/pngconf.h	2011-04-10 06:41:20.484075380 -0500
@@ -1412,39 +1412,8 @@
           __attribute__((__deprecated__))
 #      endif
 #    endif /* PNG_PRIVATE */
 #  endif /* __GNUC__ */
-
-#  if defined(_MSC_VER)  && (_MSC_VER >= 1300)
-#    ifndef PNG_USE_RESULT
-#      define PNG_USE_RESULT /* not supported */
-#    endif
-#    ifndef PNG_NORETURN
-#      define PNG_NORETURN   __declspec(noreturn)
-#    endif
-#    ifndef PNG_PTR_NORETURN
-#      define PNG_PTR_NORETURN /* not supported */
-#    endif
-#    ifndef PNG_ALLOCATED
-#      define PNG_ALLOCATED __declspec(restrict)
-#    endif
-
-    /* This specifically protects structure members that should only be
-     * accessed from within the library, therefore should be empty during
-     * a library build.
-     */
-#    ifndef PNGLIB_BUILD
-#      ifndef PNG_DEPRECATED
-#        define PNG_DEPRECATED __declspec(deprecated)
-#      endif
-#      ifndef PNG_DEPSTRUCT
-#        define PNG_DEPSTRUCT  __declspec(deprecated)
-#      endif
-#      ifndef PNG_PRIVATE
-#        define PNG_PRIVATE __declspec(deprecated)
-#      endif
-#    endif /* PNGLIB_BUILD */
-#  endif /* _MSC_VER */
 #endif /* PNG_PEDANTIC_WARNINGS */
 
 #ifndef PNG_DEPRECATED
 #  define PNG_DEPRECATED  /* Use of this function is deprecated */
diff -ru4NwbB libpng-1.4.6/pngwutil.c libpng-1.4.7/pngwutil.c
--- libpng-1.4.6/pngwutil.c	2011-04-08 11:58:24.109706123 -0500
+++ libpng-1.4.7/pngwutil.c	2011-04-10 06:41:20.643386363 -0500
@@ -681,8 +681,11 @@
           */
          if (length >= 2 &&
              png_ptr->height < 16384 && png_ptr->width < 16384)
          {
+            unsigned int z_cinfo;
+            unsigned int half_z_window_size;
+
             /* Compute the maximum possible length of the datastream */
 
             /* Number of pixels, plus for each row a filter byte and possible
              * and possibly a padding byte, so increase the maximum
@@ -699,10 +702,10 @@
             if (png_ptr->interlaced)
                uncompressed_idat_size += ((png_ptr->height + 7)/8) *
                    (png_ptr->bit_depth < 8 ? 12 : 6);
 
-            unsigned int z_cinfo = z_cmf >> 4;
-            unsigned int half_z_window_size = 1 << (z_cinfo + 7);
+            z_cinfo = z_cmf >> 4;
+            half_z_window_size = 1 << (z_cinfo + 7);
             while (uncompressed_idat_size <= half_z_window_size &&
                    half_z_window_size >= 256)
             {
                z_cinfo--;