mirror of
https://git.freebsd.org/ports.git
synced 2025-06-28 08:00:31 -04:00
1a8a092d9f
While there, run make makepatch on affected ports, and rename patches accordingly. Sponsored by: Absolight
31 lines
1.2 KiB
Text
31 lines
1.2 KiB
Text
--- export.c.orig 2011-01-15 05:52:22 UTC
|
|
+++ export.c
|
|
@@ -496,7 +496,7 @@ ASImage2png_int ( ASImage *im, void *dat
|
|
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 ;
|
|
--- import.c.orig 2011-01-15 05:52:22 UTC
|
|
+++ import.c
|
|
@@ -1251,7 +1251,7 @@ png2ASImage_int( void *data, png_rw_ptr
|
|
* 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;
|
|
}
|