From 476250ebd23f4f38472021b3c4eb8dba5bcf8965 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 23 Jul 2015 20:08:25 -0500 Subject: [PATCH] [libpng16] Bump version to 1.6.19beta01 --- ANNOUNCE | 81 ++++++----------------------------- CHANGES | 2 + CMakeLists.txt | 4 +- LICENSE | 4 +- README | 2 +- configure.ac | 6 +-- libpng-manual.txt | 8 ++-- libpng.3 | 19 ++++---- libpngpf.3 | 4 +- png.5 | 2 +- png.c | 6 +-- png.h | 25 +++++------ pngconf.h | 2 +- pngtest.c | 2 +- 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.cegcc | 2 +- scripts/makefile.linux | 2 +- scripts/makefile.msys | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pnglibconf.h.prebuilt | 4 +- scripts/symbols.def | 2 +- 28 files changed, 78 insertions(+), 127 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index c0289c1a8..fe6203783 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,85 +1,32 @@ -Libpng 1.6.18 - July 23, 2015 +Libpng 1.6.19beta01 - July 24, 2015 -This is a public release of libpng, intended for use in production codes. +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. Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.6.18.tar.xz (LZMA-compressed, recommended) - libpng-1.6.18.tar.gz + 1.6.19beta01.tar.xz (LZMA-compressed, recommended) + 1.6.19beta01.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lpng1618.7z (LZMA-compressed, recommended) - lpng1618.zip + lp1619b01.7z (LZMA-compressed, recommended) + lp1619b01.zip Other information: - libpng-1.6.18-README.txt - libpng-1.6.18-LICENSE.txt - libpng-1.6.18-*.asc (armored detached GPG signatures) + 1.6.19beta01-README.txt + 1.6.19beta01-LICENSE.txt + libpng-1.6.19beta01-*.asc (armored detached GPG signatures) + +Changes since the last public release (1.6.18): + +Version 1.6.19beta01 [July 24, 2015] -Changes since the last public release (1.6.17): - Removed PNG_SET_CHUNK_[CACHE|MALLOC]_LIMIT_SUPPORTED macros. They - have been combined with PNG_SET_USER_LIMITS_SUPPORTED (resolves - bug report by Andrew Church). - Fixed rgb_to_gray checks and added tRNS checks to pngvalid.c. This - fixes some arithmetic errors that caused some tests to fail on - some 32-bit platforms (Bug reports by Peter Breitenlohner [i686] - and Petr Gajdos [i586]). - Suppressed some warnings from the Borland C++ 5.5.1/5.82 compiler - (Bug report by Viktor Szaka'ts). - Replaced "unexpected" with an integer (0xabadca11) in pngset.c - where a long was expected, to avoid a compiler warning when PNG_DEBUG > 1. - Added contrib/examples/simpleover.c, to demonstrate how to handle - alpha compositing of multiple images, using the "simplified API" - and an example PNG generation tool, contrib/examples/genpng.c - (John Bowler). - PNG_RELEASE_BUILD replaces tests where the code depended on the build base - type and can be defined on the command line, allowing testing in beta - builds (John Bowler). - Avoid Coverity issue 80858 (REVERSE NULL) in pngtest.c - Avoid a harmless potential integer overflow in png_XYZ_from_xy() (Bug - report from Christopher Ferris). - Backport filter selection code from libpng-1.7.0beta51, to combine - sub_row, up_row, avg_row, and paeth_row into try_row and tst_row. - Changed png_voidcast(), etc., to voidcast(), etc., in contrib/tools/pngfix.c - to avoid confusion with the libpng private macros. - Fixed old cut&paste bug in the weighted filter selection code in - pngwutil.c, introduced in libpng-0.95, March 1997. - Removed WRITE_WEIGHTED_FILTERED code, to save a few kbytes of the - compiled library size. It never worked properly and as far as we can - tell, no one uses it. The png_set_filter_heuristics() and - png_set_filter_heuristics_fixed() APIs are retained but deprecated - and do nothing. - Quieted some Coverity issues in pngfix.c, png-fix-itxt.c, pngvalid.c, - pngstest.c, and pngimage.c. Most seem harmless, but png-fix-itxt - would only work with iTXt chunks with length 255 or less. - Removed non-working progressive reader 'skip' function. This - function has apparently never been used. It was implemented - to support back-door modification of png_struct in libpng-1.4.x - but (because it does nothing and cannot do anything) was apparently - never tested (John Bowler). - Fixed cexcept.h in which GCC 5 now reports that one of the auto - variables in the Try macro needs to be volatile to prevent value - being lost over the setjmp (John Bowler). - Added #ifdef's to contrib/examples programs so people don't try - to compile them without the minimum required support enabled - (suggested by Flavio Medeiros). - Eliminated the final two Coverity defects (insecure temporary file - handling in contrib/libtests/pngstest.c; possible overflow of - unsigned char in contrib/tools/png-fix-itxt.c). To use the "secure" - file handling, define PNG_USE_MKSTEMP, otherwise "tmpfile()" will - be used. - Removed some unused WEIGHTED_FILTER macros from pngstruct.h - Replaced arbitrary use of 'extern' with #define PNG_LINKAGE_*. To - preserve API compatibility, the new defines all default to "extern" - (requested by Jan Nijtmans). - Belatedly added Mans Rullgard and James Yu to the list of Contributing - Authors. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index d678392a5..adb62cb7c 100644 --- a/CHANGES +++ b/CHANGES @@ -5305,6 +5305,8 @@ Version 1.6.18rc03 [July 15, 2015] Version 1.6.18 [July 23, 2015] No changes. +Version 1.6.19beta01 [July 24, 2015] + 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 62d516070..2663c1c95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 6) -set(PNGLIB_RELEASE 18) +set(PNGLIB_RELEASE 19) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -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.18 +# VERSION 16.${PNGLIB_RELEASE}.1.6.19beta01 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 090a3600c..3c9af2f02 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.18, July 23, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.6.19beta01, July 24, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors: @@ -104,4 +104,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 23, 2015 +July 24, 2015 diff --git a/README b/README index 3c181a304..d1e59f0b4 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.18 - July 23, 2015 (shared library 16.0) +README for libpng version 1.6.19beta01 - July 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 4fb07785f..5e9cfa50a 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.18],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.19beta01],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -39,10 +39,10 @@ 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.18 +PNGLIB_VERSION=1.6.19beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 -PNGLIB_RELEASE=18 +PNGLIB_RELEASE=19 dnl End of version number stuff diff --git a/libpng-manual.txt b/libpng-manual.txt index da247cf84..8a92a16b3 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.18 - July 23, 2015 + libpng version 1.6.19beta01 - July 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.18 - July 23, 2015 + libpng versions 0.97, January 1998, through 1.6.19beta01 - July 24, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5262,13 +5262,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -July 23, 2015 +July 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.18 are Y2K compliant. It is my belief that earlier +upward through 1.6.19beta01 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 bb079d43e..e24465c33 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "July 23, 2015" +.TH LIBPNG 3 "July 24, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.18 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.19beta01 .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.18 - July 23, 2015 + libpng version 1.6.19beta01 - July 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.18 - July 23, 2015 + libpng versions 0.97, January 1998, through 1.6.19beta01 - July 24, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5770,13 +5770,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -July 23, 2015 +July 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.18 are Y2K compliant. It is my belief that earlier +upward through 1.6.19beta01 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 @@ -6034,6 +6034,7 @@ the first widely used release: 1.6.18beta01-09 16 10618 16.so.16.18[.0] 1.6.18rc01-03 16 10618 16.so.16.18[.0] 1.6.18 16 10618 16.so.16.18[.0] + 1.6.19beta01 16 10619 16.so.16.19[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6090,7 +6091,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.18 - July 23, 2015: +Libpng version 1.6.19beta01 - July 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). @@ -6113,7 +6114,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.6.18, July 23, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.6.19beta01, July 24, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors: @@ -6207,7 +6208,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 23, 2015 +July 24, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index f5511dd2a..9397bec4d 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "July 23, 2015" +.TH LIBPNGPF 3 "July 24, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.18 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.19beta01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 37a8525c6..2107544a1 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "July 23, 2015" +.TH PNG 5 "July 24, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index f6e353ace..9b8153cff 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_18 Your_png_h_is_not_version_1_6_18; +typedef png_libpng_version_1_6_19beta01 Your_png_h_is_not_version_1_6_19beta01; /* 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 @@ -766,13 +766,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.18 - July 23, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.6.19beta01 - July 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.18 - July 23, 2015\ + return "libpng version 1.6.19beta01 - July 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."; diff --git a/png.h b/png.h index f2013cf75..99223f37d 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.18, July 23, 2015 + * libpng version 1.6.19beta01, July 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.18, July 23, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.6.19beta01, July 24, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -219,6 +219,7 @@ * 1.6.18beta01-09 16 10618 16.so.16.18[.0] * 1.6.18rc01-03 16 10618 16.so.16.18[.0] * 1.6.18 16 10618 16.so.16.18[.0] + * 1.6.18beta01 16 10619 16.so.16.19[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -250,7 +251,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.6.18, July 23, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.6.19beta01, July 24, 2015, are * Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.0.6 * with the following individuals added to the list of Contributing Authors: @@ -359,13 +360,13 @@ * Y2K compliance in libpng: * ========================= * - * July 23, 2015 + * July 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.18 are Y2K compliant. It is my belief that + * upward through 1.6.19beta01 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 @@ -427,9 +428,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.18" +#define PNG_LIBPNG_VER_STRING "1.6.19beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.18 - July 23, 2015\n" + " libpng version 1.6.19beta01 - July 24, 2015\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -437,13 +438,13 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 6 -#define PNG_LIBPNG_VER_RELEASE 18 +#define PNG_LIBPNG_VER_RELEASE 19 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 0 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -460,7 +461,7 @@ #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with PNG_LIBPNG_BUILD_PRIVATE */ -#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -468,7 +469,7 @@ * version 1.0.0 was mis-numbered 100 instead of 10000). From * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */ -#define PNG_LIBPNG_VER 10618 /* 1.6.18 */ +#define PNG_LIBPNG_VER 10619 /* 1.6.19 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -573,7 +574,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_18; +typedef char* png_libpng_version_1_6_19beta01; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 62e37cf2b..4b072b986 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.18, July 23, 2015 + * libpng version 1.6.19beta01, July 23, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 84745b6d4..430c0d16f 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2028,4 +2028,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_18 Your_png_h_is_not_version_1_6_18; +typedef png_libpng_version_1_6_19beta01 Your_png_h_is_not_version_1_6_19beta01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 096e86fb1..bf6b91e27 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.18 - July 23, 2015 +libpng version 1.6.19beta01 - July 24, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 89c38f3e1..f3d2b4dec 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@