diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2011-05-14 18:19:46 -0500 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2011-05-14 18:19:46 -0500 |
| commit | 9c4331f9396f7b14b9afe6046b775595de84354f (patch) | |
| tree | e81a38bb12dcb9f6b2414e06e0413aa6e0d8ff6c | |
| parent | ea5af733415ba5519c7abf0c9be961b248005479 (diff) | |
| download | aports-9c4331f9396f7b14b9afe6046b775595de84354f.tar.bz2 aports-9c4331f9396f7b14b9afe6046b775595de84354f.tar.xz | |
main/imlib2: add missing patch
| -rw-r--r-- | main/imlib2/imlib2-png15.patch | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/main/imlib2/imlib2-png15.patch b/main/imlib2/imlib2-png15.patch new file mode 100644 index 0000000000..d66b918000 --- /dev/null +++ b/main/imlib2/imlib2-png15.patch @@ -0,0 +1,78 @@ +# http://sourceforge.net/mailarchive/message.php?msg_id=26972342 + +$NetBSD: patch-af,v 1.4 2011/01/14 10:02:54 wiz Exp $ + +Fix build with png-1.5. + +--- src/modules/loaders/loader_png.c.orig 2010-02-08 00:29:06.000000000 -0800 ++++ src/modules/loaders/loader_png.c 2010-02-08 00:34:14.000000000 -0800 +@@ -58,7 +58,7 @@ + fclose(f); + return 0; + } +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(f); +@@ -238,7 +238,7 @@ + png_structp png_ptr; + png_infop info_ptr; + DATA32 *ptr; +- int x, y, j; ++ int x, y, j, interlace; + png_bytep row_ptr, data = NULL; + png_color_8 sig_bit; + int pl = 0; +@@ -265,7 +265,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); + return 0; + } +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + fclose(f); + png_destroy_write_struct(&png_ptr, (png_infopp) & info_ptr); +@@ -274,11 +274,11 @@ + } + + /* check whether we should use interlacing */ ++ interlace = PNG_INTERLACE_NONE; + if ((tag = __imlib_GetTag(im, "interlacing")) && tag->val) + { + #ifdef PNG_WRITE_INTERLACING_SUPPORTED +- png_ptr->interlaced = PNG_INTERLACE_ADAM7; +- num_passes = png_set_interlace_handling(png_ptr); ++ interlace = PNG_INTERLACE_ADAM7; + #endif + } + +@@ -286,7 +286,7 @@ + if (im->flags & F_HAS_ALPHA) + { + png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8, +- PNG_COLOR_TYPE_RGB_ALPHA, png_ptr->interlaced, ++ PNG_COLOR_TYPE_RGB_ALPHA, interlace, + PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); + #ifdef WORDS_BIGENDIAN + png_set_swap_alpha(png_ptr); +@@ -297,7 +297,7 @@ + else + { + png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8, PNG_COLOR_TYPE_RGB, +- png_ptr->interlaced, PNG_COMPRESSION_TYPE_BASE, ++ interlace, PNG_COMPRESSION_TYPE_BASE, + PNG_FILTER_TYPE_BASE); + data = malloc(im->w * 3 * sizeof(char)); + } +@@ -344,6 +344,10 @@ + png_set_shift(png_ptr, &sig_bit); + png_set_packing(png_ptr); + ++#ifdef PNG_WRITE_INTERLACING_SUPPORTED ++ num_passes = png_set_interlace_handling(png_ptr); ++#endif ++ + for (pass = 0; pass < num_passes; pass++) + { + ptr = im->data; |