[gentoo-commits] gentoo-x86 commit in x11-wm/afterstep/files: afterstep-2.2.9-libpng15.patch

[gentoo-commits] gentoo-x86 commit in x11-wm/afterstep/files: afterstep-2.2.9-libpng15.patch

[Samuli Suominen (ssuominen)]

ssuominen    11/10/06 12:19:45

  Added:                afterstep-2.2.9-libpng15.patch
  Log:
  Fix building with libpng15 wrt #385851 by "Zosiek"
  
  (Portage version: 2.2.0_alpha61/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch?rev=1.1&content-type=text/plain

Index: afterstep-2.2.9-libpng15.patch
===================================================================
--- libAfterImage/export.c
+++ libAfterImage/export.c
@@ -483,7 +483,7 @@
 	png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
     if ( png_ptr != NULL )
     	if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
-			if( setjmp(png_ptr->jmpbuf) )
+			if( setjmp(png_jmpbuf(png_ptr)) )
 			{
 				png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
 				info_ptr = NULL ;
--- libAfterImage/import.c
+++ libAfterImage/import.c
@@ -1251,7 +1251,7 @@
 			 * the normal method of doing things with libpng).  REQUIRED unless you
 			 * set up your own error handlers in the png_create_read_struct() earlier.
 			 */
-			if ( !setjmp (png_ptr->jmpbuf))
+			if ( !setjmp (png_jmpbuf(png_ptr)))
 			{
 				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
 
@@ -1468,7 +1468,7 @@
 
 static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
 {
-   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
+   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr);
    memcpy(data, buf->buffer, length);
    buf->buffer += length;
 }