From bd29bb933cf80f397dd28286635da2aec58e6e6c Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 16 Aug 2012 11:26:54 +0200 Subject: [PATCH] patch: libpng Squashed commit of the following: commit 9df6d60274c95b5081faf5b398aa27cde969c649 Author: Nils Philippsen Date: Mon Nov 21 13:50:38 2011 +0100 support libpng-1.5 --- src/xsane-save.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xsane-save.c b/src/xsane-save.c index 87ef685..5461bf1 100644 --- a/src/xsane-save.c +++ b/src/xsane-save.c @@ -4912,7 +4912,7 @@ int xsane_save_png(FILE *outfile, int compression, FILE *imagefile, Image_info * return -1; /* error */ } - if (setjmp(png_ptr->jmpbuf)) + if (setjmp(png_jmpbuf(png_ptr))) { snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG); xsane_back_gtk_error(buf, TRUE); @@ -5102,7 +5102,7 @@ int xsane_save_png_16(FILE *outfile, int compression, FILE *imagefile, Image_inf return -1; /* error */ } - if (setjmp(png_ptr->jmpbuf)) + if (setjmp(png_jmpbuf(png_ptr))) { snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG); xsane_back_gtk_error(buf, TRUE); -- 1.7.11.4