[libpng17] Port recent zlib windowBits handling from libpng-1.6.3beta06

This commit is contained in:
Glenn Randers-Pehrson
2013-05-10 17:37:42 -05:00
parent 0cc23ac171
commit bd56d76417
21 changed files with 1570 additions and 48 deletions

View File

@@ -1,5 +1,5 @@
Makefiles for libpng version 1.7.0beta13 - April 30, 2013
Makefiles for libpng version 1.7.0beta13 - May 10, 2013
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile

View File

@@ -238,6 +238,7 @@ option SET_OPTION disabled
# ARM_NEON: the optimization itself
# ARM_NEON_API: allow the optimization to be switched on with png_set_hardware
# ARM_NEON_CHECK: compile a run-time check to see if Neon extensions are
setting ZLIB_VERNUM default @ZLIB_VERNUM
# supported, this is poorly supported and deprectated - use the
# png_set_hardware API.
option ARM_NEON disabled,
@@ -425,7 +426,7 @@ option SET_USER_LIMITS requires USER_LIMITS
# to libpng 1.6; the new interfaces in 1.6 will take several years to become
# popular.
option READ enables READ_INTERLACING
option READ enables READ_INTERLACING SET_OPTION
# Disabling READ_16BIT does not disable reading 16-bit PNG files, but it
# forces them to be chopped down to 8-bit, and disables any 16-bit

View File

@@ -2,7 +2,7 @@
/* pnglibconf.h - library build configuration */
/* Libpng version 1.7.0beta13 - April 30, 2013 */
/* Libpng version 1.7.0beta13 - May 10, 2013 */
/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */
@@ -103,7 +103,7 @@
#define PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
#define PNG_SEQUENTIAL_READ_SUPPORTED
#define PNG_SETJMP_SUPPORTED
/*#undef PNG_SET_OPTION_SUPPORTED*/
#define PNG_SET_OPTION_SUPPORTED
#define PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
#define PNG_SET_USER_LIMITS_SUPPORTED
#define PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
@@ -200,6 +200,7 @@
#define PNG_TEXT_Z_DEFAULT_COMPRESSION (-1)
#define PNG_TEXT_Z_DEFAULT_STRATEGY 0
#define PNG_WEIGHT_SHIFT 8
#define PNG_ZLIB_VERNUM 0 /* unknown */
#define PNG_ZBUF_SIZE 8192
#define PNG_ZLIB_HEADER <zlib.h>
#define PNG_Z_DEFAULT_COMPRESSION (-1)