head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.6
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.4
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.2
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q3:1.1.0.6
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.4
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.2
	pkgsrc-2011Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2011.12.05.17.33.32;	author joerg;	state dead;
branches;
next	1.1;

1.1
date	2011.01.31.10.17.41;	author wiz;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update evas to 1.1.0. Includes auto-alignment for text, ICO support, PSD
loading, external processors for PDF etc and many bug fixes and
performance improvements.
@
text
@$NetBSD: patch-aa,v 1.1 2011/01/31 10:17:41 wiz Exp $

Fix build with png-1.5.

--- src/modules/savers/png/evas_image_save_png.c.orig	2009-06-18 08:02:54.000000000 +0000
+++ src/modules/savers/png/evas_image_save_png.c
@@@@ -40,7 +40,7 @@@@ save_image_png(RGBA_Image *im, const cha
    png_structp         png_ptr;
    png_infop           info_ptr;
    DATA32             *ptr, *data = NULL;
-   int                 x, y, j;
+   int                 x, y, j, p_interlace;
    png_bytep           row_ptr, png_data = NULL;
    png_color_8         sig_bit;
    int                 num_passes = 1, pass;
@@@@ -68,11 +68,11 @@@@ save_image_png(RGBA_Image *im, const cha
 	goto close_file;
      }
 
+   p_interlace = PNG_INTERLACE_NONE;
    if (interlace)
      {
 #ifdef PNG_WRITE_INTERLACING_SUPPORTED
-	png_ptr->interlaced = PNG_INTERLACE_ADAM7;
-	num_passes = png_set_interlace_handling(png_ptr);
+	p_interlace = PNG_INTERLACE_ADAM7;
 #endif
      }
 
@@@@ -89,7 +89,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, p_interlace,
 		     PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
 #ifdef WORDS_BIGENDIAN
 	png_set_swap_alpha(png_ptr);
@@@@ -102,7 +102,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, p_interlace,
 		     PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
 	png_data = alloca(im->cache_entry.w * 3 * sizeof(char));
      }
@@@@ -117,6 +117,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;
@


1.1
log
@Fix build with png-1.5.
@
text
@d1 1
a1 1
$NetBSD$
@