25 lines
967 B
Plaintext
25 lines
967 B
Plaintext
$OpenBSD: patch-libAfterImage_import_c,v 1.1 2011/07/08 20:38:01 naddy Exp $
|
|
|
|
Fix build with png-1.5.
|
|
|
|
--- libAfterImage/import.c.orig Tue Jul 5 22:13:26 2011
|
|
+++ libAfterImage/import.c Tue Jul 5 22:14:14 2011
|
|
@@ -1251,7 +1251,7 @@ png2ASImage_int( void *data, png_rw_ptr read_fn, ASIma
|
|
* 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 @@ typedef struct ASImPNGReadBuffer
|
|
|
|
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;
|
|
}
|