From 8978eba436835a9a932473d7461ee460063462ac Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 30 Nov 2015 16:57:23 -0600 Subject: [PATCH] [libpng17] Update CHANGES and ANNOUNCE, update dates in png.c and png.h --- ANNOUNCE | 47 +++++++++++++++++++++++++++++++++++++---------- CHANGES | 34 ++++++++++++++++++++++++++-------- png.c | 4 ++-- png.h | 12 ++++++------ 4 files changed, 71 insertions(+), 26 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index a490ff1af..ee1fa742a 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta70 - November 25, 2015 +Libpng 1.7.0beta70 - November 30, 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. @@ -15,8 +15,8 @@ Source files with LF line endings (for Unix/Linux) and with a Source files with CRLF line endings (for Windows), without the "configure" script - lp170b70.7z (LZMA-compressed, recommended) - lp170b70.zip + /scratch/glennrp/Libpng17/lp170b70.7z (LZMA-compressed, recommended) + /scratch/glennrp/Libpng17/lp170b70.zip Other information: @@ -1022,7 +1022,7 @@ Version 1.7.0beta69 [November 24, 2015] Temporarily disabled filter selection while writing, and temporarily replaced pngtest.png accordingly. -Version 1.7.0beta70 [November 25, 2015] +Version 1.7.0beta70 [November 30, 2015] Fixed a simple bracket problem that prevented reading non-interlaced PNG files with height == 1. The code failed to zero out the row buffer at the start of a pass where @@ -1031,12 +1031,39 @@ Version 1.7.0beta70 [November 25, 2015] been zeroed when allocated was not always correct for non-interlaced images. Revealed by pngvalid --size with a hack to make it always use AVG. - Fixed an error in handling of bad zlib CMINFO field, found by American - Fuzzy Lop, reported by Brian Carpenter. inflate() doesn't immediately - fault a bad CMINFO field; instead a 'too far back' error happens later - (at least some times). pngfix failed to limit CMINFO to the allowed - values but then assumed that window_bits was in range, triggering an - assert. The bug is mostly harmless; the file can't be fixed. + Fixed an error in handling of bad zlib CMINFO field in pngfix, found by + American Fuzzy Lop, reported by Brian Carpenter. inflate() doesn't + immediately fault a bad CMINFO field; instead a 'too far back' error + happens later (at least some times). pngfix failed to limit CMINFO to + the allowed values but then assumed that window_bits was in range, + triggering an assert. The bug is mostly harmless; the PNG file cannot + be fixed. + Test the 'size' images in the sequential reader. The existing test + case only uses the progressive reader which means that important parts of + the filter code never got tested. + Improved pngvalid coverage of filter combinations, remove the (new in 1.7) + code which disabled previous-row filters on the first row of an image in + some cases. + Removed all trailing spaces from source files in contrib + Moved code round and changed the filter write interfaces that took + png_uint_32 buffer pixel counts to unsigned int. Also moved compression + code and definitions into pngwutil.c so that the compression code is + isolated from other definitions. + Unified the compression code so that inflate calls are localized to a common + routine. Ground work for filter selection support. Minor API changes to + use void* not byte* for data parameters. Unification of some of the + compression code with the decompression code; IDAT_size replaces + IDAT_read_size and zbuffer_size, IDAT reading and writing is no longer + controlled by the size of the compression buffer. + +Send comments/corrections/commendations to png-mng-implement at lists.sf.net +(subscription required; visit +https://lists.sourceforge.net/lists/listinfo/png-mng-implement +to subscribe) +or to glennrp at users.sourceforge.net + +Glenn R-P +#endif Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 1a2d8c24a..9718e1fea 100644 --- a/CHANGES +++ b/CHANGES @@ -5321,7 +5321,7 @@ Version 1.7.0beta69 [November 24, 2015] Temporarily disabled filter selection while writing, and temporarily replaced pngtest.png accordingly. -Version 1.7.0beta70 [November 25, 2015] +Version 1.7.0beta70 [November 30, 2015] Fixed a simple bracket problem that prevented reading non-interlaced PNG files with height == 1. The code failed to zero out the row buffer at the start of a pass where @@ -5330,13 +5330,31 @@ Version 1.7.0beta70 [November 25, 2015] been zeroed when allocated was not always correct for non-interlaced images. Revealed by pngvalid --size with a hack to make it always use AVG. - Fixed an error in handling of bad zlib CMINFO field, found by American - Fuzzy Lop, reported by Brian Carpenter. inflate() doesn't immediately - fault a bad CMINFO field; instead a 'too far back' error happens later - (at least some times). pngfix failed to limit CMINFO to the allowed - values but then assumed that window_bits was in range, triggering an - assert. The bug is mostly harmless; the file can't be fixed. - + Fixed an error in handling of bad zlib CMINFO field in pngfix, found by + American Fuzzy Lop, reported by Brian Carpenter. inflate() doesn't + immediately fault a bad CMINFO field; instead a 'too far back' error + happens later (at least some times). pngfix failed to limit CMINFO to + the allowed values but then assumed that window_bits was in range, + triggering an assert. The bug is mostly harmless; the PNG file cannot + be fixed. + Test the 'size' images in the sequential reader. The existing test + case only uses the progressive reader which means that important parts of + the filter code never got tested. + Improved pngvalid coverage of filter combinations, remove the (new in 1.7) + code which disabled previous-row filters on the first row of an image in + some cases. + Removed all trailing spaces from source files in contrib + Moved code round and changed the filter write interfaces that took + png_uint_32 buffer pixel counts to unsigned int. Also moved compression + code and definitions into pngwutil.c so that the compression code is + isolated from other definitions. + Unified the compression code so that inflate calls are localized to a common + routine. Ground work for filter selection support. Minor API changes to + use void* not byte* for data parameters. Unification of some of the + compression code with the decompression code; IDAT_size replaces + IDAT_read_size and zbuffer_size, IDAT reading and writing is no longer + controlled by the size of the compression buffer. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/png.c b/png.c index 3d32a5a79..407e54a68 100644 --- a/png.c +++ b/png.c @@ -712,13 +712,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta70 - November 24, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta70 - November 30, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2015 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE; # else - return "libpng version 1.7.0beta70 - November 24, 2015\ + return "libpng version 1.7.0beta70 - November 30, 2015\ Copyright (c) 1998-2015 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; diff --git a/png.h b/png.h index a4b0c3d0f..2c403cb65 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta70, November 24, 2015 + * libpng version 1.7.0beta70, November 30, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.7.0beta70, November 24, 2015: + * libpng versions 0.97, January 1998, through 1.7.0beta70, November 30, 2015: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -25,7 +25,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.7.0beta70, November 24, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.7.0beta70, November 30, 2015, are * Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, are * derived from libpng-1.0.6, and are distributed according to the same * disclaimer and license as libpng-1.0.6 with the following individuals @@ -190,7 +190,7 @@ * 1.6.19rc01-03 16 10619 16.so.16.19[.0] * ... * 1.7.0alpha01-10 17 10700 17.so.17.0[.0] - * 1.7.0beta01-68 17 10700 17.so.17.0[.0] + * 1.7.0beta01-70 17 10700 17.so.17.0[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -218,7 +218,7 @@ * Y2K compliance in libpng: * ========================= * - * November 24, 2015 + * November 30, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -288,7 +288,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.7.0beta70" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta70 - November 24, 2015\n" + " libpng version 1.7.0beta70 - November 30, 2015\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17