diff --git a/ANNOUNCE b/ANNOUNCE index b123c3868..a17436a1a 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta55 - March 4, 2015 +Libpng 1.7.0beta55 - March 6, 2015 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. @@ -739,7 +739,9 @@ Version 1.7.0beta54 [March 4, 2015] Visual Studio (Sergey Kosarevsky) Merged pngwrite.c with libpng-1.6.17beta06/pngwrite.c -Version 1.7.0beta55 [March 4, 2015] +Version 1.7.0beta55 [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 984914210..540424fca 100644 --- a/CHANGES +++ b/CHANGES @@ -5029,7 +5029,9 @@ Version 1.7.0beta54 [March 4, 2015] Visual Studio (Sergey Kosarevsky) Merged pngwrite.c with libpng-1.6.17beta06/pngwrite.c -Version 1.7.0beta55 [March 4, 2015] +Version 1.7.0beta55 [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 005b52b27..ede5879ae 100644 --- a/scripts/pnglibconf.dfa +++ b/scripts/pnglibconf.dfa @@ -393,10 +393,14 @@ option USER_LIMITS requires READ # # 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 5f7ce5768..08611ecdb 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -2,7 +2,7 @@ /* pnglibconf.h - library build configuration */ -/* Libpng version 1.7.0beta55 - March 4, 2015 */ +/* Libpng version 1.7.0beta55 - March 6, 2015 */ /* Copyright (c) 1998-2014 Glenn Randers-Pehrson */ @@ -197,10 +197,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_HEADER