Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 262583 Details for
Bug 354989
media-libs/imlib2: compilation fails with media-libs/libpng-1.5.x
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
imlib2-1.4.4-libpng15.patch
imlib2-1.4.4-libpng15.patch (text/plain), 2.49 KB, created by
Lars Wendler (Polynomial-C) (RETIRED)
on 2011-02-15 09:56:52 UTC
(
hide
)
Description:
imlib2-1.4.4-libpng15.patch
Filename:
MIME Type:
Creator:
Lars Wendler (Polynomial-C) (RETIRED)
Created:
2011-02-15 09:56:52 UTC
Size:
2.49 KB
patch
obsolete
># 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;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 354989
: 262583