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