cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libpng16] Add #include <setjmp.h> to contrib/tools/pngfix.c to allow "make" to

Browse Source 
complete without setjmp support (bug report by Claudio Fontana)
This commit is contained in:
Glenn Randers-Pehrson 2014-09-10 21:34:34 -05:00
parent 0a3c788b51
commit de5e34f3ce
3 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ANNOUNCE
View File

@ -1,4 +1,4 @@
Libpng 1.6.14beta01 - September 10, 2014 Libpng 1.6.14beta01 - September 11, 2014
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.
@ -25,11 +25,10 @@ Other information:
Changes since the last public release (1.6.13): Changes since the last public release (1.6.13):
Version 1.6.14beta01 [September 10, 2014] Version 1.6.14beta01 [September 11, 2014]
Guard usage of png_ptr->options with #ifdef PNG_SET_OPTION_SUPPORTED. Guard usage of png_ptr->options with #ifdef PNG_SET_OPTION_SUPPORTED.
Add #ifdef PNG_SETJMP_SUPPORTED where needed in contrib/tools/pngfix.c Add #include <setjmp.h> to contrib/tools/pngfix.c to allow "make" to
to allow "make all" to complete without setjmp support (bug report complete without setjmp support (bug report by Claudio Fontana)
by Claudio Fontana)
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

7
CHANGES
View File

@ -4978,11 +4978,10 @@ Version 1.6.13rc01 [August 14, 2014]
Version 1.6.13 [August 21, 2014] Version 1.6.13 [August 21, 2014]
No changes. No changes.
Version 1.6.14beta01 [September 10, 2014] Version 1.6.14beta01 [September 11, 2014]
Guard usage of png_ptr->options with #ifdef PNG_SET_OPTION_SUPPORTED. Guard usage of png_ptr->options with #ifdef PNG_SET_OPTION_SUPPORTED.
Add #ifdef PNG_SETJMP_SUPPORTED where needed in contrib/tools/pngfix.c Add #include <setjmp.h> to contrib/tools/pngfix.c to allow "make" to
to allow "make all" to complete without setjmp support (bug report complete without setjmp support (bug report by Claudio Fontana)
by Claudio Fontana)
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

11
contrib/tools/pngfix.c
View File

@ -18,6 +18,7 @@
#include <limits.h> #include <limits.h>
#include <errno.h> #include <errno.h>
#include <assert.h> #include <assert.h>
#include <setjmp.h>
#define implies(x,y) assert(!(x) || (y)) #define implies(x,y) assert(!(x) || (y))
@ -49,7 +50,6 @@
# error "pngfix will not work with libpng prior to 1.6.3" # error "pngfix will not work with libpng prior to 1.6.3"
#endif #endif
#ifdef PNG_SETJMP_SUPPORTED
#if defined(PNG_READ_SUPPORTED) && defined(PNG_EASY_ACCESS_SUPPORTED) #if defined(PNG_READ_SUPPORTED) && defined(PNG_EASY_ACCESS_SUPPORTED)
/* zlib.h defines the structure z_stream, an instance of which is included /* zlib.h defines the structure z_stream, an instance of which is included
* in this structure and is required for decompressing the LZ compressed * in this structure and is required for decompressing the LZ compressed
@ -4035,12 +4035,3 @@ main(void)
return 77; return 77;
} }
#endif /* PNG_READ_SUPPORTED && PNG_EASY_ACCESS_SUPPORTED */ #endif /* PNG_READ_SUPPORTED && PNG_EASY_ACCESS_SUPPORTED */
#else /* No setjmp support */
int
main(void)
{
fprintf(stderr, "pngfix does not work without setjmp support\n");
return 77;
}
#endif /* PNG_SETJMP_SUPPORTED */