From 92ec30a3b10049b9874fadf40e36fcb4228f351d Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 24 Nov 2015 07:34:37 -0600 Subject: [PATCH] [libpng16] Imported from libpng-1.6.20beta03.tar --- ANNOUNCE | 21 ++++++++++++--------- CHANGES | 5 ++++- CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- configure.ac | 4 ++-- contrib/libtests/pngimage.c | 2 +- contrib/libtests/pngvalid.c | 2 +- libpng-manual.txt | 6 +++--- libpng.3 | 16 ++++++++-------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 8 ++++---- png.h | 18 +++++++++--------- pngconf.h | 2 +- pngerror.c | 2 +- pnginfo.h | 2 +- pngpread.c | 2 +- pngtest.c | 6 +++--- pngwutil.c | 6 +++--- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 10 +++++----- scripts/def.c | 2 +- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pnglibconf.h.prebuilt | 4 ++-- scripts/symbols.def | 2 +- 31 files changed, 77 insertions(+), 71 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index a204b95d0..882559de3 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.20beta02 - November 23, 2015 +Libpng 1.6.20beta03 - November 24, 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. @@ -8,20 +8,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.20beta02.tar.xz (LZMA-compressed, recommended) - 1.6.20beta02.tar.gz + 1.6.20beta03.tar.xz (LZMA-compressed, recommended) + 1.6.20beta03.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1620b02.7z (LZMA-compressed, recommended) - lp1620b02.zip + lp1620b03.7z (LZMA-compressed, recommended) + lp1620b03.zip Other information: - 1.6.20beta02-README.txt - 1.6.20beta02-LICENSE.txt - libpng-1.6.20beta02-*.asc (armored detached GPG signatures) + 1.6.20beta03-README.txt + 1.6.20beta03-LICENSE.txt + libpng-1.6.20beta03-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.19): @@ -29,10 +29,13 @@ Version 1.6.20beta01 [November 20, 2015] Avoid potential pointer overflow/underflow in png_handle_sPLT() and png_handle_pCAL() (Bug report by John Regehr). -Version 1.6.20beta02 [(PENDING RELEASE)] +Version 1.6.20beta02 [November 23, 2015] Fixed bug recently introduced in png_set_PLTE() that uses png_ptr not info_ptr. +Version 1.6.20beta03 [(PENDING RELEASE)] + Backported tests from libpng-1.7.0beta69. + 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/CHANGES b/CHANGES index 1466e50a0..16eafe9bf 100644 --- a/CHANGES +++ b/CHANGES @@ -5418,10 +5418,13 @@ Version 1.6.20beta01 [November 20, 2015] Avoid potential pointer overflow/underflow in png_handle_sPLT() and png_handle_pCAL() (Bug report by John Regehr). -Version 1.6.20beta02 [(PENDING RELEASE)] +Version 1.6.20beta02 [November 23, 2015] Fixed bug recently introduced in png_set_PLTE() that uses png_ptr not info_ptr. +Version 1.6.20beta03 [(PENDING RELEASE)] + Backported tests from libpng-1.7.0beta69. + 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/CMakeLists.txt b/CMakeLists.txt index 1e25968fe..ad7d4f7c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -261,7 +261,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.20beta02 +# VERSION 16.${PNGLIB_RELEASE}.1.6.20beta03 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index bbe6d671f..a8865fbb3 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.6.20beta02, November 23, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.6.20beta03, November 24, 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 @@ -109,4 +109,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 23, 2015 +November 24, 2015 diff --git a/README b/README index c57477f2d..37724922c 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.20beta02 - November 23, 2015 (shared library 16.0) +README for libpng version 1.6.20beta03 - November 24, 2015 (shared library 16.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. diff --git a/configure.ac b/configure.ac index 5e1eefad7..5313dd2e2 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.20beta02],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.20beta03],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -39,7 +39,7 @@ dnl automake, so the following is not necessary (and is not defined anyway): dnl AM_PREREQ([1.11.2]) dnl stop configure from automagically running automake -PNGLIB_VERSION=1.6.20beta02 +PNGLIB_VERSION=1.6.20beta03 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=20 diff --git a/contrib/libtests/pngimage.c b/contrib/libtests/pngimage.c index 8e825e866..58bb9a193 100644 --- a/contrib/libtests/pngimage.c +++ b/contrib/libtests/pngimage.c @@ -2,7 +2,7 @@ * * Copyright (c) 2015 John Cunningham Bowler * - * Last changed in libpng 1.6.18 [(PENDING RELEASE)] + * Last changed in libpng 1.6.20 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c index ad1a5f785..4d8da5f01 100644 --- a/contrib/libtests/pngvalid.c +++ b/contrib/libtests/pngvalid.c @@ -1,7 +1,7 @@ /* pngvalid.c - validate libpng by constructing then reading png files. * - * Last changed in libpng 1.5.24 [(PENDING RELEASE)] + * Last changed in libpng 1.5.25 [RDATE%] * Copyright (c) 2014-2015 Glenn Randers-Pehrson * Written by John Cunningham Bowler * diff --git a/libpng-manual.txt b/libpng-manual.txt index 7fcc43df5..75949f46b 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1,6 +1,6 @@ libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.6.20beta02 - November 23, 2015 + libpng version 1.6.20beta03 - November 24, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.20beta02 - November 23, 2015 + libpng versions 0.97, January 1998, through 1.6.20beta03 - November 24, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5323,7 +5323,7 @@ Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.6.20beta02 are Y2K compliant. It is my belief that earlier +upward through 1.6.20beta03 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer diff --git a/libpng.3 b/libpng.3 index ef5274ae9..e917e61f1 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "November 23, 2015" +.TH LIBPNG 3 "November 24, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.20beta02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.20beta03 .SH SYNOPSIS \fB #include \fP @@ -508,7 +508,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.6.20beta02 - November 23, 2015 + libpng version 1.6.20beta03 - November 24, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -519,7 +519,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.20beta02 - November 23, 2015 + libpng versions 0.97, January 1998, through 1.6.20beta03 - November 24, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5831,7 +5831,7 @@ Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.6.20beta02 are Y2K compliant. It is my belief that earlier +upward through 1.6.20beta03 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer @@ -5989,7 +5989,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.20beta02 - November 23, 2015: +Libpng version 1.6.20beta03 - November 24, 2015: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6014,7 +6014,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.6.20beta02, November 23, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.6.20beta03, November 24, 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 @@ -6113,7 +6113,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 23, 2015 +November 24, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 54b69240d..e8fd083a0 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "November 23, 2015" +.TH LIBPNGPF 3 "November 24, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.20beta02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.20beta03 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 5b3daab0e..0fca673b5 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "November 23, 2015" +.TH PNG 5 "November 24, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 3a4d0771c..6dc069606 100644 --- a/png.c +++ b/png.c @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_20beta02 Your_png_h_is_not_version_1_6_20beta02; +typedef png_libpng_version_1_6_20beta03 Your_png_h_is_not_version_1_6_20beta03; /* Tells libpng that we have already handled the first "num_bytes" bytes * of the PNG file signature. If the PNG data is embedded into another @@ -775,13 +775,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.20beta02 - November 23, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.6.20beta03 - November 24, 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.6.20beta02 - November 23, 2015\ + return "libpng version 1.6.20beta03 - November 24, 2015\ Copyright (c) 1998-2015 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -2343,7 +2343,7 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr, * Fall through to "no match". */ png_chunk_report(png_ptr, - "Not recognizing known sRGB profile that has been edited", + "Not recognizing known sRGB profile that has been edited", PNG_CHUNK_WARNING); break; # endif diff --git a/png.h b/png.h index d5db87022..e653c912f 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.20beta02, November 23, 2015 + * libpng version 1.6.20beta03, November 24, 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.6.20beta02, November 23, 2015: + * libpng versions 0.97, January 1998, through 1.6.20beta03, November 24, 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.6.20beta02, November 23, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.6.20beta03, November 24, 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 @@ -214,13 +214,13 @@ * Y2K compliance in libpng: * ========================= * - * November 23, 2015 + * November 24, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.20beta02 are Y2K compliant. It is my belief that + * upward through 1.6.20beta03 are Y2K compliant. It is my belief that * earlier versions were also Y2K compliant. * * Libpng only has two year fields. One is a 2-byte unsigned integer @@ -282,9 +282,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.20beta02" +#define PNG_LIBPNG_VER_STRING "1.6.20beta03" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.20beta02 - November 23, 2015\n" + " libpng version 1.6.20beta03 - November 24, 2015\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -298,7 +298,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 02 +#define PNG_LIBPNG_VER_BUILD 03 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -433,7 +433,7 @@ extern "C" { /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char* png_libpng_version_1_6_20beta02; +typedef char* png_libpng_version_1_6_20beta03; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index c3cf32ba5..15640dc65 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.20beta02, November 23, 2015 + * libpng version 1.6.20beta03, November 24, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index 0781866a8..bdb959ee5 100644 --- a/pngerror.c +++ b/pngerror.c @@ -768,7 +768,7 @@ png_longjmp,(png_const_structrp png_ptr, int val),PNG_NORETURN) /* If control reaches this point, png_longjmp() must not return. The only * choice is to terminate the whole process (or maybe the thread); to do - * this the ANSI-C abort() function is used unless a different method is + * this the ANSI-C abort() function is used unless a different method is * implemented by overriding the default configuration setting for * PNG_ABORT(). */ diff --git a/pnginfo.h b/pnginfo.h index c8c874dd1..4bd264b86 100644 --- a/pnginfo.h +++ b/pnginfo.h @@ -223,7 +223,7 @@ defined(PNG_READ_BACKGROUND_SUPPORTED) /* Storage for unknown chunks that the library doesn't recognize. */ png_unknown_chunkp unknown_chunks; - /* The type of this field is limited by the type of + /* The type of this field is limited by the type of * png_struct::user_chunk_cache_max, else overflow can occur. */ int unknown_chunks_num; diff --git a/pngpread.c b/pngpread.c index 9f68f9902..076084a55 100644 --- a/pngpread.c +++ b/pngpread.c @@ -133,7 +133,7 @@ png_process_some_data(png_structrp png_ptr, png_inforp info_ptr) void /* PRIVATE */ png_push_read_sig(png_structrp png_ptr, png_inforp info_ptr) { - png_size_t num_checked = png_ptr->sig_bytes, /* SAFE, does not exceed 8 */ + png_size_t num_checked = png_ptr->sig_bytes, /* SAFE, does not exceed 8 */ num_to_check = 8 - num_checked; if (png_ptr->buffer_size < num_to_check) diff --git a/pngtest.c b/pngtest.c index 5e38cf43c..b12214d8a 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.7.0 [(PENDING RELEASE)] + * Last changed in libpng 1.5.25 [(PENDING RELEASE)] * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -1422,7 +1422,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) { # ifdef calc_pass_height png_uint_32 pass_height; - + if (num_passes == 7) /* interlaced */ { if (PNG_PASS_COLS(width, pass) > 0) @@ -2070,4 +2070,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_20beta02 Your_png_h_is_not_version_1_6_20beta02; +typedef png_libpng_version_1_6_20beta03 Your_png_h_is_not_version_1_6_20beta03; diff --git a/pngwutil.c b/pngwutil.c index adc4729c2..0ee102b5f 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -2563,7 +2563,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) if (filter_to_do == PNG_FILTER_SUB) /* It's the only filter so no testing is needed */ { - (void) png_setup_sub_row(png_ptr, bpp, row_bytes, mins); + (void) png_setup_sub_row(png_ptr, bpp, row_bytes, mins); best_row = png_ptr->try_row; } @@ -2572,7 +2572,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) png_size_t sum; png_size_t lmins = mins; - sum = png_setup_sub_row(png_ptr, bpp, row_bytes, lmins); + sum = png_setup_sub_row(png_ptr, bpp, row_bytes, lmins); if (sum < mins) { @@ -2598,7 +2598,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) png_size_t sum; png_size_t lmins = mins; - sum = png_setup_up_row(png_ptr, row_bytes, lmins); + sum = png_setup_up_row(png_ptr, row_bytes, lmins); if (sum < mins) { diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 617e14227..baead4f69 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.20beta02 - November 23, 2015 +libpng version 1.6.20beta03 - November 24, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 17d5cfe6c..a512d3d34 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@