head	1.4;
access;
symbols
	pkgsrc-2013Q2:1.4.0.4
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2012Q4:1.4.0.2
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2012Q3:1.3.0.10
	pkgsrc-2012Q3-base:1.3
	pkgsrc-2012Q2:1.3.0.8
	pkgsrc-2012Q2-base:1.3
	pkgsrc-2012Q1:1.3.0.6
	pkgsrc-2012Q1-base:1.3
	pkgsrc-2011Q4:1.3.0.4
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q3:1.3.0.2
	pkgsrc-2011Q3-base:1.3
	pkgsrc-2011Q2:1.2.0.4
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2011Q1:1.2.0.2
	pkgsrc-2011Q1-base:1.2;
locks; strict;
comment	@# @;


1.4
date	2012.10.03.14.36.10;	author adam;	state dead;
branches;
next	1.3;

1.3
date	2011.08.30.22.34.13;	author drochner;	state Exp;
branches;
next	1.2;

1.2
date	2011.01.24.12.29.42;	author wiz;	state Exp;
branches;
next	1.1;

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


desc
@@


1.4
log
@Changes 2.26.4
* Make tiff loader threadsafe
* Support saving ICC profiles in jpeg
* Add some missing annotations
* Documentation improvements
* Translation updates
@
text
@$NetBSD: patch-af,v 1.3 2011/08/30 22:34:13 drochner Exp $

--- gdk-pixbuf/io-png.c.orig	2011-03-04 00:04:14.000000000 +0000
+++ gdk-pixbuf/io-png.c
@@@@ -654,7 +654,7 @@@@ png_info_callback   (png_structp png_rea
                                      GDK_PIXBUF_ERROR,
                                      GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
                                      _("Insufficient memory to store a %ld by %ld image; try exiting some applications to reduce memory usage"),
-                                     width, height);
+                                     (long)width, (long)height);
                 }
                 return;
         }
@


1.3
log
@update to 2.24.0
This switches to the latest stable branch.
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@Note upstream bug reports.
@
text
@d1 1
a1 1
$NetBSD: patch-af,v 1.1 2011/01/13 17:14:43 wiz Exp $
d3 1
a3 4
Fix build with png-1.5.
https://bugzilla.gnome.org/show_bug.cgi?id=640404

--- gdk-pixbuf/io-png.c.orig	2010-07-10 00:54:35.000000000 +0000
d5 1
a5 40
@@@@ -183,7 +183,11 @@@@ png_simple_error_callback(png_structp pn
                              error_msg);
         }
 
+#if (PNG_LIBPNG_VER < 10500)
         longjmp (png_save_ptr->jmpbuf, 1);
+#else
+        png_longjmp (png_save_ptr, 1);
+#endif
 }
 
 static void
@@@@ -287,7 +291,7 @@@@ gdk_pixbuf__png_image_load (FILE *f, GEr
 		return NULL;
 	}
 
-	if (setjmp (png_ptr->jmpbuf)) {
+	if (setjmp (png_jmpbuf(png_ptr))) {
 	    	g_free (rows);
 
 		if (pixbuf)
@@@@ -459,7 +463,7 @@@@ gdk_pixbuf__png_image_begin_load (GdkPix
                 return NULL;
         }
         
-	if (setjmp (lc->png_read_ptr->jmpbuf)) {
+	if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
 		if (lc->png_info_ptr)
 			png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
                 g_free(lc);
@@@@ -531,7 +535,7 @@@@ gdk_pixbuf__png_image_load_increment(gpo
         lc->error = error;
         
         /* Invokes our callbacks as needed */
-	if (setjmp (lc->png_read_ptr->jmpbuf)) {
+	if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
                 lc->error = NULL;
 		return FALSE;
 	} else {
@@@@ -654,7 +658,7 @@@@ png_info_callback   (png_structp png_rea
a13 21
@@@@ -769,7 +773,11 @@@@ png_error_callback(png_structp png_read_
                              error_msg);
         }
 
+#if (PNG_LIBPNG_VER < 10500)
         longjmp (png_read_ptr->jmpbuf, 1);
+#else
+        png_longjmp (png_read_ptr, 1);
+#endif
 }
 
 static void
@@@@ -978,7 +986,7 @@@@ static gboolean real_save_png (GdkPixbuf
 	       success = FALSE;
 	       goto cleanup;
        }
-       if (setjmp (png_ptr->jmpbuf)) {
+       if (setjmp (png_jmpbuf(png_ptr))) {
 	       success = FALSE;
 	       goto cleanup;
        }
@


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