Fri Jan 14 07:53:39 2011 UTC ()
fixes build with png>=1.5.
(obache)
diff -r1.6 -r1.7 pkgsrc/multimedia/ming/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/ming/patches/patch-aj
diff -r0 -r1.1 pkgsrc/multimedia/ming/patches/patch-ak
--- pkgsrc/multimedia/ming/distinfo 2010/04/09 01:33:43 1.6
+++ pkgsrc/multimedia/ming/distinfo 2011/01/14 07:53:39 1.7
$NetBSD: patch-aj,v 1.1 2011/01/14 07:53:39 obache Exp $
* Use API instead of direct access, for png>=1.5.
--- src/blocks/pngdbl.c.orig 2008-12-22 13:33:58.000000000 +0000
+++ src/blocks/pngdbl.c
@@ -61,7 +61,7 @@ static png_structp openPngFromFile(FILE
}
static int pngReadFunc(png_structp png, unsigned char *buf, int len)
-{ SWFInput input = (SWFInput) png->io_ptr;
+{ SWFInput input = (SWFInput) png_get_io_ptr(png);
return SWFInput_read(input, buf, len);
}
@@ -127,7 +127,7 @@ static int readPNG(png_structp png_ptr,
return 0;
}
- if(setjmp(png_ptr->jmpbuf))
+ if(setjmp(png_jmpbuf(png_ptr)))
{
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
return 0;
$NetBSD: patch-ak,v 1.1 2011/01/14 07:53:39 obache Exp $
* Use API instead of direct access, for png>=1.5.
--- util/png2dbl.c.orig 2008-12-22 13:33:59.000000000 +0000
+++ util/png2dbl.c
@@ -91,7 +91,7 @@ struct pngdata readPNG(FILE *fp)
error("Couldn't create end_info\n");
}
- if(setjmp(png_ptr->jmpbuf))
+ if(setjmp(png_jmpbuf(png_ptr)))
{
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
fclose(fp);