diff options
Diffstat (limited to 'www/links/patches/patch-aa')
| -rw-r--r-- | www/links/patches/patch-aa | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/www/links/patches/patch-aa b/www/links/patches/patch-aa index 124a705b893..fae1abb2081 100644 --- a/www/links/patches/patch-aa +++ b/www/links/patches/patch-aa @@ -1,12 +1,12 @@ -$NetBSD: patch-aa,v 1.6 2011/01/14 10:37:22 wiz Exp $ +$NetBSD: patch-aa,v 1.7 2011/05/02 13:17:47 wiz Exp $ Fix build with png-1.5. ---- png.c.orig 2008-08-18 01:14:38.000000000 +0000 +--- png.c.orig 2011-04-19 15:17:49.000000000 +0000 +++ png.c -@@ -48,7 +48,11 @@ void img_my_png_warning(png_structp a, p +@@ -38,7 +38,11 @@ static void img_my_png_warning(png_struc /* Error for from-web PNG images. */ - void img_my_png_error(png_structp png_ptr, png_const_charp error_string) + static void img_my_png_error(png_structp png_ptr, png_const_charp error_string) { +#if (PNG_LIBPNG_VER < 10500) longjmp(png_ptr->jmpbuf,1); @@ -15,8 +15,8 @@ Fix build with png-1.5. +#endif } - void png_info_callback(png_structp png_ptr, png_infop info_ptr) -@@ -204,7 +208,7 @@ void png_start(struct cached_image *cimg + static void png_info_callback(png_structp png_ptr, png_infop info_ptr) +@@ -196,7 +200,7 @@ void png_start(struct cached_image *cimg #ifdef DEBUG if (!info_ptr) internal ("png_create_info_struct failed\n"); #endif /* #ifdef DEBUG */ @@ -25,7 +25,7 @@ Fix build with png-1.5. error: png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); -@@ -214,7 +218,7 @@ error: +@@ -206,7 +210,7 @@ error: png_set_progressive_read_fn(png_ptr, NULL, png_info_callback, png_row_callback, png_end_callback); @@ -34,7 +34,7 @@ Fix build with png-1.5. decoder=mem_alloc(sizeof(*decoder)); decoder->png_ptr=png_ptr; decoder->info_ptr=info_ptr; -@@ -233,7 +237,7 @@ void png_restart(struct cached_image *ci +@@ -225,7 +229,7 @@ void png_restart(struct cached_image *ci png_ptr=((struct png_decoder *)(cimg->decoder))->png_ptr; info_ptr=((struct png_decoder *)(cimg->decoder))->info_ptr; end_callback_hit=0; |