diff options
Diffstat (limited to 'www/mMosaic/patches')
-rw-r--r-- | www/mMosaic/patches/patch-aa | 6 | ||||
-rw-r--r-- | www/mMosaic/patches/patch-ai | 78 |
2 files changed, 81 insertions, 3 deletions
diff --git a/www/mMosaic/patches/patch-aa b/www/mMosaic/patches/patch-aa index c72d78da389..20a42e8cf07 100644 --- a/www/mMosaic/patches/patch-aa +++ b/www/mMosaic/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.4 2005/03/06 16:56:17 fredb Exp $ +$NetBSD: patch-aa,v 1.5 2006/04/19 19:21:28 wiz Exp $ ---- Makefile.orig 2001-02-01 07:27:30.000000000 -0600 +--- Makefile.orig 2001-02-01 14:27:30.000000000 +0100 +++ Makefile @@ -45,13 +45,13 @@ CC = cc # GCC : Linux Intel optimised @@ -82,7 +82,7 @@ $NetBSD: patch-aa,v 1.4 2005/03/06 16:56:17 fredb Exp $ +#pnginc = /usr/local/include +#pnglibs = /usr/local/lib/libpng.a /usr/local/lib/libz.a +pnginc = ${LOCALBASE}/include -+pnglibs = -lpng -lz -Wl,-R${LOCALBASE}/lib ++pnglibs = `libpng-config --ldflags` # To disable PNG support comment this. diff --git a/www/mMosaic/patches/patch-ai b/www/mMosaic/patches/patch-ai new file mode 100644 index 00000000000..516e970e07d --- /dev/null +++ b/www/mMosaic/patches/patch-ai @@ -0,0 +1,78 @@ +$NetBSD: patch-ai,v 1.1 2006/04/19 19:21:28 wiz Exp $ + +--- src/readPNG.c.orig 2000-12-08 19:00:45.000000000 +0100 ++++ src/readPNG.c +@@ -35,8 +35,8 @@ unsigned char * ReadPNG(FILE *infile,int + unsigned char *pixmap; + unsigned char *p; + png_byte *q; +- png_struct *png_ptr; +- png_info *info_ptr; ++ png_structp png_ptr; ++ png_infop info_ptr; + double screen_gamma; + png_byte *png_pixels=NULL, **row_pointers=NULL; + int i, j; +@@ -60,14 +60,16 @@ unsigned char * ReadPNG(FILE *infile,int + rewind(infile); + + /* allocate the structures */ +- png_ptr = (png_struct *)calloc(1,sizeof(png_struct)); +- if(!png_ptr) +- return 0; +- +- info_ptr = (png_info *)calloc(1,sizeof(png_info)); +- if(!info_ptr) { +- free(png_ptr); +- return 0; ++ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, ++ NULL, NULL, NULL); ++ if (!png_ptr) ++ return (0); ++ ++ info_ptr = png_create_info_struct(png_ptr); ++ if (!info_ptr) { ++ png_destroy_read_struct(&png_ptr, (png_infopp)NULL, ++ (png_infopp)NULL); ++ return (0); + } + + /* Establish the setjmp return context for png_error to use. */ +@@ -76,24 +78,18 @@ unsigned char * ReadPNG(FILE *infile,int + if (mMosaicSrcTrace) { + fprintf(stderr, "\n!!!libpng read error!!!\n"); + } +- png_read_destroy(png_ptr, info_ptr, (png_info *)0); ++ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + + if(png_pixels != NULL) + free((char *)png_pixels); + if(row_pointers != NULL) + free((png_byte **)row_pointers); +- free((char *)png_ptr); +- free((char *)info_ptr); + return 0; + } + + /* SWP -- Hopefully to fix cores on bad PNG files */ + /*####png_set_message_fn(png_ptr,png_get_msg_ptr(png_ptr),NULL,NULL); */ + +- /* initialize the structures */ +- png_info_init(info_ptr); +- png_read_init(png_ptr); +- + /* set up the input control */ + png_init_io(png_ptr, infile); + +@@ -283,10 +279,7 @@ pixmap, since I don't do anything with i + } + free((png_byte **)row_pointers); + /* clean up after the read, and free any memory allocated */ +- png_read_destroy(png_ptr, info_ptr, (png_info *)0); +-/* free the structures */ +- free((char *)png_ptr); +- free((char *)info_ptr); ++ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + return pixmap; + } + #endif |