projects / packages / xsane.git / blame
| Commit | Line | Data |
|---|---|---|
| 94120488 ER |
1 | # from Fedora |
| 2 | # fix building with libpng >= 1.5 | |
| 3 | # submitted to upstream (Oliver Rauch) via email, 2011-11-21 | |
| 4 | ||
| 12d07cfb AM |
5 | From bd29bb933cf80f397dd28286635da2aec58e6e6c Mon Sep 17 00:00:00 2001 |
| 6 | From: Nils Philippsen <nils@redhat.com> | |
| 7 | Date: Thu, 16 Aug 2012 11:26:54 +0200 | |
| 8 | Subject: [PATCH] patch: libpng | |
| 9 | ||
| 10 | Squashed commit of the following: | |
| 11 | ||
| 12 | commit 9df6d60274c95b5081faf5b398aa27cde969c649 | |
| 13 | Author: Nils Philippsen <nils@redhat.com> | |
| 14 | Date: Mon Nov 21 13:50:38 2011 +0100 | |
| 15 | ||
| 16 | support libpng-1.5 | |
| 17 | --- | |
| 18 | src/xsane-save.c | 4 ++-- | |
| 19 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
| 20 | ||
| 21 | diff --git a/src/xsane-save.c b/src/xsane-save.c | |
| 22 | index 87ef685..5461bf1 100644 | |
| 23 | --- a/src/xsane-save.c | |
| 24 | +++ b/src/xsane-save.c | |
| 25 | @@ -4912,7 +4912,7 @@ int xsane_save_png(FILE *outfile, int compression, FILE *imagefile, Image_info * | |
| 26 | return -1; /* error */ | |
| 27 | } | |
| 28 | ||
| 29 | - if (setjmp(png_ptr->jmpbuf)) | |
| 30 | + if (setjmp(png_jmpbuf(png_ptr))) | |
| 31 | { | |
| 32 | snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG); | |
| 33 | xsane_back_gtk_error(buf, TRUE); | |
| 34 | @@ -5102,7 +5102,7 @@ int xsane_save_png_16(FILE *outfile, int compression, FILE *imagefile, Image_inf | |
| 35 | return -1; /* error */ | |
| 36 | } | |
| 37 | ||
| 38 | - if (setjmp(png_ptr->jmpbuf)) | |
| 39 | + if (setjmp(png_jmpbuf(png_ptr))) | |
| 40 | { | |
| 41 | snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG); | |
| 42 | xsane_back_gtk_error(buf, TRUE); | |
| 43 | -- | |
| 44 | 1.7.11.4 | |
| 45 |