* [gentoo-commits] gentoo-x86 commit in media-libs/evas/files: evas-1.0.0-libpng-1.5.patch
@ 2011-02-20 1:20 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2011-02-20 1:20 UTC (permalink / raw
To: gentoo-commits
vapier 11/02/20 01:20:28
Added: evas-1.0.0-libpng-1.5.patch
Log:
Fix building with libpng-1.5.
(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)
Revision Changes Path
1.1 media-libs/evas/files/evas-1.0.0-libpng-1.5.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/evas/files/evas-1.0.0-libpng-1.5.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/evas/files/evas-1.0.0-libpng-1.5.patch?rev=1.1&content-type=text/plain
Index: evas-1.0.0-libpng-1.5.patch
===================================================================
make it work with libpng-1.5
--- src/modules/savers/png/evas_image_save_png.c
+++ src/modules/savers/png/evas_image_save_png.c
@@ -66,10 +66,13 @@ save_image_png(RGBA_Image *im, const cha
if (interlace)
{
#ifdef PNG_WRITE_INTERLACING_SUPPORTED
- png_ptr->interlaced = PNG_INTERLACE_ADAM7;
- num_passes = png_set_interlace_handling(png_ptr);
+ interlace = PNG_INTERLACE_ADAM7;
+#else
+ interlace = PNG_INTERLACE_NONE;
#endif
}
+ else
+ interlace = PNG_INTERLACE_NONE;
if (im->cache_entry.flags.alpha)
{
@@ -84,7 +87,7 @@ save_image_png(RGBA_Image *im, const cha
evas_common_convert_argb_unpremul(data, im->cache_entry.w * im->cache_entry.h);
png_init_io(png_ptr, f);
png_set_IHDR(png_ptr, info_ptr, im->cache_entry.w, im->cache_entry.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);
@@ -97,7 +100,7 @@ save_image_png(RGBA_Image *im, const cha
data = im->image.data;
png_init_io(png_ptr, f);
png_set_IHDR(png_ptr, info_ptr, im->cache_entry.w, im->cache_entry.h, 8,
- PNG_COLOR_TYPE_RGB, png_ptr->interlaced,
+ PNG_COLOR_TYPE_RGB, interlace,
PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
png_data = alloca(im->cache_entry.w * 3 * sizeof(char));
}
@@ -112,6 +115,10 @@ save_image_png(RGBA_Image *im, const cha
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 = data;
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/evas/files: evas-1.0.0-libpng-1.5.patch
@ 2012-02-08 20:33 Thomas Sachau (tommy)
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Sachau (tommy) @ 2012-02-08 20:33 UTC (permalink / raw
To: gentoo-commits
tommy 12/02/08 20:33:23
Removed: evas-1.0.0-libpng-1.5.patch
Log:
Drop unused patch
(Portage version: 2.2.0_alpha85-r1/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-08 20:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-20 1:20 [gentoo-commits] gentoo-x86 commit in media-libs/evas/files: evas-1.0.0-libpng-1.5.patch Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2012-02-08 20:33 Thomas Sachau (tommy)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox