diff --git a/ANNOUNCE b/ANNOUNCE index bc7be631e..c50b1a6e8 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.35beta01 - March 6, 2018 +Libpng 1.6.35beta02 - March 6, 2018 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,19 +8,19 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.35beta01.tar.xz (LZMA-compressed, recommended) - 1.6.35beta01.tar.gz + 1.6.35beta02.tar.xz (LZMA-compressed, recommended) + 1.6.35beta02.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1635b01.7z (LZMA-compressed, recommended) - lp1635b01.zip + lp1635b02.7z (LZMA-compressed, recommended) + lp1635b02.zip Other information: - 1.6.35beta01-README.txt - 1.6.35beta01-LICENSE.txt + 1.6.35beta02-README.txt + 1.6.35beta02-LICENSE.txt Changes since the last public release (1.6.34): diff --git a/CMakeLists.txt b/CMakeLists.txt index 462a1dfee..1c004e496 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -844,7 +844,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(png PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.35beta01 +# VERSION 16.${PNGLIB_RELEASE}.1.6.35beta02 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 27c08460c..5a8f870aa 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.35beta01, March 6, 2018 are +libpng versions 1.0.7, July 1, 2000 through 1.6.35beta02, March 6, 2018 are Copyright (c) 2000-2002, 2004, 2006-2018 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 diff --git a/README b/README index 8b4a1bcda..d717dfa60 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.35beta01 - March 6, 2018 (shared library 16.0) +README for libpng version 1.6.35beta02 - March 6, 2018 (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 504e7c437..f667b8c20 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.35beta01],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.35beta02],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -46,7 +46,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.35beta01 +PNGLIB_VERSION=1.6.35beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=35 diff --git a/libpng-manual.txt b/libpng-manual.txt index abecdf212..081a1cbb8 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.35beta01 - March 6, 2018 + libpng version 1.6.35beta02 - March 6, 2018 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 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.35beta01 - March 6, 2018 + libpng versions 0.97, January 1998, through 1.6.35beta02 - March 6, 2018 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -5414,7 +5414,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.35beta01 are Y2K compliant. It is my belief that earlier +upward through 1.6.35beta02 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 4bcfc6ae0..4827d80f6 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "March 6, 2018" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.35beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.35beta02 .SH SYNOPSIS \fB #include \fP @@ -518,7 +518,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.35beta01 - March 6, 2018 + libpng version 1.6.35beta02 - March 6, 2018 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -529,7 +529,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.35beta01 - March 6, 2018 + libpng versions 0.97, January 1998, through 1.6.35beta02 - March 6, 2018 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2017 Glenn Randers-Pehrson @@ -5932,7 +5932,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.35beta01 are Y2K compliant. It is my belief that earlier +upward through 1.6.35beta02 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 @@ -6090,7 +6090,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.35beta01 - March 6, 2018: +Libpng version 1.6.35beta02 - March 6, 2018: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6115,7 +6115,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.35beta01, March 6, 2018 are +libpng versions 1.0.7, July 1, 2000 through 1.6.35beta02, March 6, 2018 are Copyright (c) 2000-2002, 2004, 2006-2018 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 diff --git a/libpngpf.3 b/libpngpf.3 index f7303f656..e13a01035 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "April 1, 2017" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.35beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.35beta02 (private functions) .SH SYNOPSIS \fB\fB#include \fI\fI"pngpriv.h" diff --git a/png.c b/png.c index a7beaaf23..b556bb455 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_35beta01 Your_png_h_is_not_version_1_6_35beta01; +typedef png_libpng_version_1_6_35beta02 Your_png_h_is_not_version_1_6_35beta02; #ifdef __GNUC__ /* The version tests may need to be added to, but the problem warning has @@ -816,14 +816,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.35beta01 - March 6, 2018" PNG_STRING_NEWLINE \ + "libpng version 1.6.35beta02 - March 6, 2018" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2018 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.35beta01 - March 6, 2018\ + return "libpng version 1.6.35beta02 - March 6, 2018\ Copyright (c) 1998-2002,2004,2006-2018 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 9143faf0a..48c8fc347 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.35beta01, March 6, 2018 + * libpng version 1.6.35beta02, March 6, 2018 * * Copyright (c) 1998-2002,2004,2006-2018 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.35beta01, March 6, 2018: + * libpng versions 0.97, January 1998, through 1.6.35beta02, March 6, 2018: * 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.35beta01, March 6, 2018 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.35beta02, March 6, 2018 are * Copyright (c) 2000-2002, 2004, 2006-2018 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 @@ -247,7 +247,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.35beta01 are Y2K compliant. It is my belief that + * upward through 1.6.35beta02 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 @@ -309,8 +309,8 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.35beta01" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.35beta01 - March 6, 2018\n" +#define PNG_LIBPNG_VER_STRING "1.6.35beta02" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.35beta02 - March 6, 2018\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -324,7 +324,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 01 +#define PNG_LIBPNG_VER_BUILD 02 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -459,7 +459,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_35beta01; +typedef char* png_libpng_version_1_6_35beta02; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index c242026fb..7ef2c6bda 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.35beta01, March 6, 2018 + * libpng version 1.6.35beta02, March 6, 2018 * * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index aee743716..61a206482 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2153,4 +2153,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_35beta01 Your_png_h_is_not_version_1_6_35beta01; +typedef png_libpng_version_1_6_35beta02 Your_png_h_is_not_version_1_6_35beta02; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index bb06b716a..4ac10571d 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.35beta01 - March 6, 2018 +libpng version 1.6.35beta02 - March 6, 2018 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 39799cc2f..5992da6a7 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@