From f633a4eb9c2892e0ffa3ea681a2ffa5f4bc08af3 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 1 Oct 2014 10:03:57 -0500 Subject: [PATCH] [libpng16] Added "option READ_iCCP enables READ_COMPRESSED_TEXT" to pnglibconf.dfa --- ANNOUNCE | 5 +++-- CHANGES | 3 ++- scripts/pnglibconf.dfa | 37 ++++++++++--------------------------- 3 files changed, 15 insertions(+), 30 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 9efdee237..94cd1898d 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.14beta05 - September 27, 2014 +Libpng 1.6.14beta05 - October 1, 2014 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. @@ -51,7 +51,8 @@ Version 1.6.14beta04 [September 27, 2014] Fixed incorrect handling of the iTXt compression flag in pngrutil.c (bug report by Shunsaku Hirata). Bug was introduced in libpng-1.6.0. -Version 1.6.14beta05 [September 27, 2014] +Version 1.6.14beta05 [October 1, 2014] + Added "option READ_iCCP enables READ_COMPRESSED_TEXT" to pnglibconf.dfa Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 383c38ffb..e89175cdb 100644 --- a/CHANGES +++ b/CHANGES @@ -5004,7 +5004,8 @@ Version 1.6.14beta04 [September 27, 2014] Fixed incorrect handling of the iTXt compression flag in pngrutil.c (bug report by Shunsaku Hirata). Bug was introduced in libpng-1.6.0. -Version 1.6.14beta05 [September 27, 2014] +Version 1.6.14beta05 [October 1, 2014] + Added "option READ_iCCP enables READ_COMPRESSED_TEXT" to pnglibconf.dfa Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/scripts/pnglibconf.dfa b/scripts/pnglibconf.dfa index 07fb47bb8..bb22fb1e7 100644 --- a/scripts/pnglibconf.dfa +++ b/scripts/pnglibconf.dfa @@ -8,7 +8,7 @@ com pnglibconf.h - library build configuration com version com -com Copyright (c) 1998-2014 Glenn Randers-Pehrson +com Copyright (c) 1998-2012 Glenn Randers-Pehrson com com This code is released under the libpng license. com For conditions of distribution and use, see the disclaimer @@ -114,13 +114,6 @@ file pnglibconf.h scripts/pnglibconf.dfa PNGLCONF_H logunsupported = 1 -# The following allows the output from configure to modify the contents of -# pnglibconf.h - -@#ifdef HAVE_CONFIG_H -@# include "config.h" -@#endif - # PNG_USER_CONFIG has to be defined on the compiler command line # to cause pngusr.h to be read while constructing pnglibconf.h # @@ -196,6 +189,10 @@ setting API_RULE default 0 setting PREFIX +# Default to using the read macros + +setting DEFAULT_READ_MACROS default 1 + # Implementation specific control of the optimizations, enabled by those # hardware or software options that need it (typically when run-time choices # must be made by the user) @@ -230,21 +227,19 @@ option ARM_NEON_CHECK disabled requires ALIGNED_MEMORY, sets ARM_NEON_OPT 1 # These settings configure the default compression level (0-9) and 'strategy'; -# strategy is as defined by the implementors of zlib. It describes the input +# strategy is as defined by the implementors of zlib, it describes the input # data and modifies the zlib parameters in an attempt to optimize the balance # between search and huffman encoding in the zlib algorithms. The defaults are # the zlib.h defaults - the apparently recursive definition does not arise # because the name of the setting is prefixed by PNG_ # # The TEXT values are the defaults when writing compressed text (all forms) - -# Include the zlib header so that the defaults below are known +# +# Include the zlib header too, so that the defaults below are known @# include # 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 ZLIB_VERNUM default @ZLIB_VERNUM @@ -252,10 +247,6 @@ setting ZLIB_VERNUM default @ZLIB_VERNUM setting TEXT_Z_DEFAULT_COMPRESSION default @Z_DEFAULT_COMPRESSION setting TEXT_Z_DEFAULT_STRATEGY default @Z_DEFAULT_STRATEGY -# Default to using the read macros - -setting DEFAULT_READ_MACROS default 1 - # The alternative is to call functions to read PNG values, if # the functions are turned *off* the read macros must always # be enabled, so turning this off will actually force the @@ -379,16 +370,7 @@ option SET_USER_LIMITS enables SET_CHUNK_MALLOC_LIMIT # # If these settings are *not* set libpng will not limit the size of # images or the size of data in ancilliary chunks. This does lead to -# security issues if PNG files come from untrusted sources. Settings have the -# following interpretations: -# -# USER_WIDTH_MAX: maximum width of an image that will be read -# USER_HEIGHT_MAX: maximum height -# USER_CHUNK_MALLOC_MAX: maximum in-memory (decompressed) size of a single chunk -# USER_CHUNK_CACHE_MAX: maximum number of chunks to be cached -# -# Only chunks that are variable in number are counted towards the -# USER_CHUNK_CACHE_MAX limit +# security issues if PNG files come from untrusted sources. setting USER_WIDTH_MAX setting USER_HEIGHT_MAX setting USER_CHUNK_CACHE_MAX @@ -827,6 +809,7 @@ option SAVE_INT_32 disabled option WRITE_OPTIMIZE_CMF requires WRITE option READ_COMPRESSED_TEXT disabled +option READ_iCCP enables READ_COMPRESSED_TEXT option READ_iTXt enables READ_COMPRESSED_TEXT option READ_zTXt enables READ_COMPRESSED_TEXT option READ_COMPRESSED_TEXT enables READ_TEXT