[libpng17] Ported libpng 1.5 options.awk/dfn file handling to 1.7, fixed one

bug.
This commit is contained in:
John Bowler
2013-02-05 10:16:42 -06:00
committed by Glenn Randers-Pehrson
parent 4245e6b1b2
commit 803493e19c
18 changed files with 314 additions and 164 deletions

View File

@@ -202,6 +202,8 @@ setting ZLIB_PREFIX
# png.h.
setting ZLIB_HEADER default <zlib.h>
# include the file too, so that the defaults below are known
@# include <zlib.h>
# These settings configure the default compression level (0-9) and 'strategy';
# strategy is as defined by the implementors of zlib, it describes the input
@@ -212,14 +214,15 @@ setting ZLIB_HEADER default <zlib.h>
#
# The TEXT values are the defaults when writing compressed text (all forms)
setting Z_DEFAULT_COMPRESSION default Z_DEFAULT_COMPRESSION
# The '@' here means to substitute the value when pnglibconf.h is built
setting Z_DEFAULT_COMPRESSION default @Z_DEFAULT_COMPRESSION
# TODO: why aren't these Z_RLE; zlib.h says that Z_RLE, specifically, is
# appropriate for PNG images, maybe it doesn't exist in all versions?
setting Z_DEFAULT_STRATEGY default Z_FILTERED
setting Z_DEFAULT_NOFILTER_STRATEGY default Z_DEFAULT_STRATEGY
setting Z_DEFAULT_STRATEGY default @Z_FILTERED
setting Z_DEFAULT_NOFILTER_STRATEGY default @Z_DEFAULT_STRATEGY
setting TEXT_Z_DEFAULT_COMPRESSION default Z_DEFAULT_COMPRESSION
setting TEXT_Z_DEFAULT_STRATEGY default Z_DEFAULT_STRATEGY
setting TEXT_Z_DEFAULT_COMPRESSION default @Z_DEFAULT_COMPRESSION
setting TEXT_Z_DEFAULT_STRATEGY default @Z_DEFAULT_STRATEGY
# Define this to something that will stop, at least, the current thread; control
# cannot proceed beyond the PNG_ABORT operation and compilation of pngerror.c is