From 377fb539448efc3d5f8bfb115604322d140c8263 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 5 Mar 2015 20:59:31 -0600 Subject: [PATCH] [libpng16] Removed some comments that the configure script did not handle properly from scripts/pnglibconf.dfa and pnglibconf.h.prebuilt. --- ANNOUNCE | 4 +++- CHANGES | 4 +++- scripts/pnglibconf.dfa | 12 +++++++----- scripts/pnglibconf.h.prebuilt | 8 ++++---- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index f50ebd31d..7db535c04 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -65,10 +65,12 @@ Version 1.6.17beta06 [February 27, 2015] Avoid runtime checks when converting integer to png_byte with Visual Studio (Sergey Kosarevsky) -Version 1.6.17rc01 [March 6, 2015] +Version 1.6.17rc01 [March 4, 2015] No changes. Version 1.6.17rc02 [March 6, 2015] + Removed some comments that the configure script did not handle + properly from scripts/pnglibconf.dfa and pnglibconf.h.prebuilt. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index a77904ace..82bb92514 100644 --- a/CHANGES +++ b/CHANGES @@ -5166,10 +5166,12 @@ Version 1.6.17beta06 [February 27, 2015] Avoid runtime checks when converting integer to png_byte with Visual Studio (Sergey Kosarevsky) -Version 1.6.17rc01 [March 6, 2015] +Version 1.6.17rc01 [March 4, 2015] No changes. Version 1.6.17rc02 [March 6, 2015] + Removed some comments that the configure script did not handle + properly from scripts/pnglibconf.dfa and pnglibconf.h.prebuilt. 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 692fd5874..5a60753ba 100644 --- a/scripts/pnglibconf.dfa +++ b/scripts/pnglibconf.dfa @@ -367,11 +367,13 @@ option USER_LIMITS requires READ # 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 -setting USER_WIDTH_MAX default 1000000 /* Use 0x7fffffff for unlimited */ -setting USER_HEIGHT_MAX default 1000000 /* Use 0x7fffffff for unlimited */ -setting USER_CHUNK_CACHE_MAX default 1000 /* Use 0 for unlimited */ -setting USER_CHUNK_MALLOC_MAX default 8000000 /* Use 0 for unlimited */ +# Use 0x7fffffff for unlimited +setting USER_WIDTH_MAX default 1000000 +setting USER_HEIGHT_MAX default 1000000 + +# Use 0 for unlimited +setting USER_CHUNK_CACHE_MAX default 1000 +setting USER_CHUNK_MALLOC_MAX default 8000000 # If this option is enabled APIs to set the above limits at run time are added; # without this the hardwired (compile time) limits will be used. diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt index 98337fc22..dd7c2e782 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -198,10 +198,10 @@ #define PNG_QUANTIZE_RED_BITS 5 #define PNG_TEXT_Z_DEFAULT_COMPRESSION (-1) #define PNG_TEXT_Z_DEFAULT_STRATEGY 0 -#define PNG_USER_CHUNK_CACHE_MAX 1000 /* Use 0 for unlimited */ -#define PNG_USER_CHUNK_MALLOC_MAX 8000000 /* Use 0 for unlimited */ -#define PNG_USER_HEIGHT_MAX 1000000 /* Use 0x7fffffff for unlimited */ -#define PNG_USER_WIDTH_MAX 1000000 /* Use 0x7fffffff for unlimited */ +#define PNG_USER_CHUNK_CACHE_MAX 1000 +#define PNG_USER_CHUNK_MALLOC_MAX 8000000 +#define PNG_USER_HEIGHT_MAX 1000000 +#define PNG_USER_WIDTH_MAX 1000000 #define PNG_WEIGHT_SHIFT 8 #define PNG_ZBUF_SIZE 8192 #define PNG_ZLIB_VERNUM 0 /* unknown */