[tkimg] fix header mismatch

[Tom Callaway]

commit 2edb18e406109bcd43d1dacc3044e9eceb5d1e36
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Mon Aug 1 16:29:59 2011 -0400

    fix header mismatch

 tkimg-libpng.patch |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 deletions(-)
---
diff --git a/tkimg-libpng.patch b/tkimg-libpng.patch
index 7c05ae0..5921503 100644
--- a/tkimg-libpng.patch
+++ b/tkimg-libpng.patch
@@ -1,6 +1,6 @@
 diff -up tkimg1.4/libpng/configure.in.libpng tkimg1.4/libpng/configure.in
 --- tkimg1.4/libpng/configure.in.libpng	2010-07-07 07:08:08.000000000 -0400
-+++ tkimg1.4/libpng/configure.in	2011-08-01 14:36:14.109613806 -0400
++++ tkimg1.4/libpng/configure.in	2011-08-01 16:10:57.459585090 -0400
 @@ -65,14 +65,6 @@ IMG_SRCPATH(zlibtcl)
  
  TEA_ADD_SOURCES([pngtcl.c pngtclStubInit.c])
@@ -18,7 +18,7 @@ diff -up tkimg1.4/libpng/configure.in.libpng tkimg1.4/libpng/configure.in
  TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${zlibtcl_BUILD_PATH}`\"])
 diff -up tkimg1.4/libpng/configure.libpng tkimg1.4/libpng/configure
 --- tkimg1.4/libpng/configure.libpng	2010-07-13 11:44:38.000000000 -0400
-+++ tkimg1.4/libpng/configure	2011-08-01 14:36:14.112613769 -0400
++++ tkimg1.4/libpng/configure	2011-08-01 16:10:57.466585002 -0400
 @@ -5235,11 +5235,6 @@ fi
  
  
@@ -42,7 +42,7 @@ diff -up tkimg1.4/libpng/configure.libpng tkimg1.4/libpng/configure
  fi
 diff -up tkimg1.4/libpng/Makefile.in.libpng tkimg1.4/libpng/Makefile.in
 --- tkimg1.4/libpng/Makefile.in.libpng	2010-07-06 09:36:37.000000000 -0400
-+++ tkimg1.4/libpng/Makefile.in	2011-08-01 14:36:14.113613756 -0400
++++ tkimg1.4/libpng/Makefile.in	2011-08-01 16:10:57.466585002 -0400
 @@ -111,7 +111,7 @@ RANLIB		= @RANLIB@
  RANLIB_STUB	= @RANLIB_STUB@
  SHLIB_CFLAGS	= @SHLIB_CFLAGS@
@@ -63,7 +63,7 @@ diff -up tkimg1.4/libpng/Makefile.in.libpng tkimg1.4/libpng/Makefile.in
  #========================================================================
 diff -up tkimg1.4/libpng/pngtclDecls.h.libpng tkimg1.4/libpng/pngtclDecls.h
 --- tkimg1.4/libpng/pngtclDecls.h.libpng	2010-08-28 08:57:50.000000000 -0400
-+++ tkimg1.4/libpng/pngtclDecls.h	2011-08-01 14:41:30.045748690 -0400
++++ tkimg1.4/libpng/pngtclDecls.h	2011-08-01 16:26:45.653678748 -0400
 @@ -16,11 +16,11 @@
  
  #include <tcl.h>
@@ -86,6 +86,19 @@ diff -up tkimg1.4/libpng/pngtclDecls.h.libpng tkimg1.4/libpng/pngtclDecls.h
  
  /* !BEGIN!: Do not edit below this line. */
  
+@@ -53,10 +53,10 @@ PNG_IMPEXP png_structp	png_create_write_
+ 				png_voidp error_ptr, png_error_ptr error_fn,
+ 				png_error_ptr warn_fn);
+ /* 6 */
+-PNG_IMPEXP png_size_t	png_get_compression_buffer_size(png_structp png_ptr);
++PNG_IMPEXP png_uint_32	png_get_compression_buffer_size(png_structp png_ptr);
+ /* 7 */
+ PNG_IMPEXP void		png_set_compression_buffer_size(png_structp png_ptr,
+-				png_size_t size);
++				png_uint_32 size);
+ /* 8 */
+ PNG_IMPEXP int		png_reset_zstream(png_structp png_ptr);
+ /* 9 */
 @@ -158,11 +158,12 @@ PNG_IMPEXP void		png_set_background(png_
  				double background_gamma);
  /* 44 */
@@ -119,6 +132,15 @@ diff -up tkimg1.4/libpng/pngtclDecls.h.libpng tkimg1.4/libpng/pngtclDecls.h
  /* 99 */
  PNG_IMPEXP void		png_free_default(png_structp png_ptr, png_voidp ptr);
  /* Slot 100 is reserved */
+@@ -340,7 +341,7 @@ PNG_IMPEXP void		png_chunk_warning(png_s
+ PNG_IMPEXP png_uint_32	png_get_valid(png_structp png_ptr,
+ 				png_infop info_ptr, png_uint_32 flag);
+ /* 108 */
+-PNG_IMPEXP png_size_t	png_get_rowbytes(png_structp png_ptr,
++PNG_IMPEXP png_uint_32	png_get_rowbytes(png_structp png_ptr,
+ 				png_infop info_ptr);
+ /* 109 */
+ PNG_IMPEXP png_bytepp	png_get_rows(png_structp png_ptr, png_infop info_ptr);
 @@ -1058,7 +1059,8 @@ typedef struct PngtclStubs {
      void (*png_set_invert_monoPtr) (png_structp png_ptr); /* 42 */
      void (*png_set_backgroundPtr) (png_structp png_ptr, png_color_16p background_color, int background_gamma_code, int need_expand, double background_gamma); /* 43 */
@@ -151,8 +173,8 @@ diff -up tkimg1.4/libpng/pngtclDecls.h.libpng tkimg1.4/libpng/pngtclDecls.h
  	(pngtclStubsPtr->png_set_gammaPtr) /* 46 */
  #define png_permit_empty_plte \
 diff -up tkimg1.4/libpng/pngtclStubInit.c.libpng tkimg1.4/libpng/pngtclStubInit.c
---- tkimg1.4/libpng/pngtclStubInit.c.libpng	2011-08-01 14:42:04.410328797 -0400
-+++ tkimg1.4/libpng/pngtclStubInit.c	2011-08-01 14:42:13.605216465 -0400
+--- tkimg1.4/libpng/pngtclStubInit.c.libpng	2010-07-08 04:26:15.000000000 -0400
++++ tkimg1.4/libpng/pngtclStubInit.c	2011-08-01 16:10:57.473584914 -0400
 @@ -163,7 +163,7 @@ const PngtclStubs pngtclStubs = {
  #if !defined(PNG_READ_DITHER_SUPPORTED)
      0, /* 45 */