AfterStep-libpng-1.5.patch

   1 diff -ur AfterStep-2.2.11.orig/libAfterImage/export.c AfterStep-2.2.11/libAfterImage/export.c
   2 --- AfterStep-2.2.11.orig/libAfterImage/export.c        2010-09-23 21:52:15.000000000 +0100
   3 +++ AfterStep-2.2.11/libAfterImage/export.c     2012-06-18 01:48:11.054109582 +0100
   4 @@ -496,7 +496,7 @@
   5         png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
   6      if ( png_ptr != NULL )
   7         if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
   8 -                       if( setjmp(png_ptr->jmpbuf) )
   9 +                       if( setjmp(png_jmpbuf(png_ptr)) )
  10                         {
  11                                 png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
  12                                 info_ptr = NULL ;
  13 diff -ur AfterStep-2.2.11.orig/libAfterImage/import.c AfterStep-2.2.11/libAfterImage/import.c
  14 --- AfterStep-2.2.11.orig/libAfterImage/import.c        2010-09-23 21:57:57.000000000 +0100
  15 +++ AfterStep-2.2.11/libAfterImage/import.c     2012-06-18 01:55:43.547156261 +0100
  16 @@ -1251,7 +1251,7 @@
  17                          * the normal method of doing things with libpng).  REQUIRED unless you
  18                          * set up your own error handlers in the png_create_read_struct() earlier.
  19                          */
  20 -                       if ( !setjmp (png_ptr->jmpbuf))
  21 +                       if ( !setjmp(png_jmpbuf(png_ptr)))
  22                         {
  23                                 ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
  24
  25 @@ -1468,7 +1468,7 @@
  26
  27  static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
  28  {
  29 -   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
  30 +   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *) png_get_io_ptr(png_ptr);
  31     memcpy(data, buf->buffer, length);
  32     buf->buffer += length;
  33  }