[master] Imported from libpng-1.6.14.tar

This commit is contained in:
Glenn Randers-Pehrson
2014-10-22 19:28:06 -05:00
parent d55c4f32fc
commit eed640dbe8
45 changed files with 429 additions and 409 deletions

View File

@@ -2,7 +2,7 @@
*
* Copyright (c) 2014 John Cunningham Bowler
*
* Last changed in libpng 1.6.10 [March 6, 2014]
* Last changed in libpng 1.6.14 [October 23, 2014]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -49,6 +49,9 @@
# error "pngfix will not work with libpng prior to 1.6.3"
#endif
#ifdef PNG_SETJMP_SUPPORTED
#include <setjmp.h>
#if defined(PNG_READ_SUPPORTED) && defined(PNG_EASY_ACCESS_SUPPORTED)
/* zlib.h defines the structure z_stream, an instance of which is included
* in this structure and is required for decompressing the LZ compressed
@@ -4034,3 +4037,12 @@ main(void)
return 77;
}
#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 */