From 52d159a7844f9a88388ff09b4eb975b50d2be9f9 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 30 Jul 2015 11:19:59 -0500 Subject: [PATCH] [libpng16] Bump version to 1.6.19beta02 --- ANNOUNCE | 20 +++++++++++--------- CHANGES | 4 +++- CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- configure.ac | 4 ++-- libpng-manual.txt | 8 ++++---- libpng.3 | 20 ++++++++++---------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 +++--- png.h | 20 ++++++++++---------- 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.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pnglibconf.h.prebuilt | 4 ++-- scripts/symbols.def | 2 +- 25 files changed, 68 insertions(+), 64 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index d68c6e590..86b2dee0e 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.19beta01 - July 29, 2015 +Libpng 1.6.19beta02 - July 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. @@ -8,24 +8,24 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.19beta01.tar.xz (LZMA-compressed, recommended) - 1.6.19beta01.tar.gz + 1.6.19beta02.tar.xz (LZMA-compressed, recommended) + 1.6.19beta02.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1619b01.7z (LZMA-compressed, recommended) - lp1619b01.zip + lp1619b02.7z (LZMA-compressed, recommended) + lp1619b02.zip Other information: - 1.6.19beta01-README.txt - 1.6.19beta01-LICENSE.txt - libpng-1.6.19beta01-*.asc (armored detached GPG signatures) + 1.6.19beta02-README.txt + 1.6.19beta02-LICENSE.txt + libpng-1.6.19beta02-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.18): -Version 1.6.19beta01 [July 29, 2015] +Version 1.6.19beta01 [July 30, 2015] Updated obsolete information about the simplified API macros in the manual pages (Bug report by Arc Riley). @@ -40,6 +40,8 @@ Version 1.6.19beta01 [July 29, 2015] Fixed potential leak of png_pixels in contrib/pngminus/pnm2png.c Fixed uninitialized variable in contrib/gregbook/rpng2-x.c +Version 1.6.19beta02 [July 30, 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/CHANGES b/CHANGES index 43a8531dc..919842c8f 100644 --- a/CHANGES +++ b/CHANGES @@ -5305,7 +5305,7 @@ Version 1.6.18rc03 [July 15, 2015] Version 1.6.18 [July 23, 2015] No changes. -Version 1.6.19beta01 [July 29, 2015] +Version 1.6.19beta01 [July 30, 2015] Updated obsolete information about the simplified API macros in the manual pages (Bug report by Arc Riley). Avoid potentially dereferencing NULL info_ptr in png_info_init_3(). @@ -5319,6 +5319,8 @@ Version 1.6.19beta01 [July 29, 2015] Fixed potential leak of png_pixels in contrib/pngminus/pnm2png.c Fixed uninitialized variable in contrib/gregbook/rpng2-x.c +Version 1.6.19beta02 [July 30, 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 2663c1c95..7deac6e8b 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.19beta01 +# VERSION 16.${PNGLIB_RELEASE}.1.6.19beta02 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 36fb838b2..536b83d11 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.19beta01, July 29, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.6.19beta02, July 30, 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 29, 2015 +July 30, 2015 diff --git a/README b/README index 28ecdd9d1..1465ffb22 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.19beta01 - July 29, 2015 (shared library 16.0) +README for libpng version 1.6.19beta02 - July 30, 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 5e9cfa50a..3be7155ea 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.19beta01],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.19beta02],[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.19beta01 +PNGLIB_VERSION=1.6.19beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=19 diff --git a/libpng-manual.txt b/libpng-manual.txt index 84e801936..d7b9377da 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.19beta01 - July 29, 2015 + libpng version 1.6.19beta02 - July 30, 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.19beta01 - July 29, 2015 + libpng versions 0.97, January 1998, through 1.6.19beta02 - July 30, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5304,13 +5304,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -July 29, 2015 +July 30, 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.19beta01 are Y2K compliant. It is my belief that earlier +upward through 1.6.19beta02 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 90b9b7dd4..7bd659c08 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "July 29, 2015" +.TH LIBPNG 3 "July 30, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.19beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.19beta02 .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.19beta01 - July 29, 2015 + libpng version 1.6.19beta02 - July 30, 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.19beta01 - July 29, 2015 + libpng versions 0.97, January 1998, through 1.6.19beta02 - July 30, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5812,13 +5812,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -July 29, 2015 +July 30, 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.19beta01 are Y2K compliant. It is my belief that earlier +upward through 1.6.19beta02 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 @@ -6076,7 +6076,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] + 1.6.19beta01-02 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 @@ -6133,7 +6133,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.19beta01 - July 29, 2015: +Libpng version 1.6.19beta02 - July 30, 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). @@ -6156,7 +6156,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.6.19beta01, July 29, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.6.19beta02, July 30, 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: @@ -6250,7 +6250,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 29, 2015 +July 30, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index e3f8ce0bc..260b8c3b7 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "July 29, 2015" +.TH LIBPNGPF 3 "July 30, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.19beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.19beta02 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 40a7a5ada..b981a9b8b 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "July 29, 2015" +.TH PNG 5 "July 30, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 410eeb164..55ebe53cf 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_19beta01 Your_png_h_is_not_version_1_6_19beta01; +typedef png_libpng_version_1_6_19beta02 Your_png_h_is_not_version_1_6_19beta02; /* 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 @@ -769,13 +769,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.19beta01 - July 29, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.6.19beta02 - July 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.6.19beta01 - July 29, 2015\ + return "libpng version 1.6.19beta02 - July 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 678a59a9f..3e7b9aae8 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.19beta01, July 29, 2015 + * libpng version 1.6.19beta02, July 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.6.19beta01, July 29, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.6.19beta02, July 30, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -219,7 +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.19beta01 16 10619 16.so.16.19[.0] + * 1.6.19beta01-02 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 @@ -251,7 +251,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.6.19beta01, July 29, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.6.19beta02, July 30, 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: @@ -360,13 +360,13 @@ * Y2K compliance in libpng: * ========================= * - * July 29, 2015 + * July 30, 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.19beta01 are Y2K compliant. It is my belief that + * upward through 1.6.19beta02 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 @@ -428,9 +428,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.19beta01" +#define PNG_LIBPNG_VER_STRING "1.6.19beta02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.19beta01 - July 29, 2015\n" + " libpng version 1.6.19beta02 - July 30, 2015\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -444,7 +444,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 @@ -579,7 +579,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_19beta01; +typedef char* png_libpng_version_1_6_19beta02; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 4b072b986..051231435 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.19beta01, July 23, 2015 + * libpng version 1.6.19beta02, 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 430c0d16f..b6bbb9670 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_19beta01 Your_png_h_is_not_version_1_6_19beta01; +typedef png_libpng_version_1_6_19beta02 Your_png_h_is_not_version_1_6_19beta02; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 67da6c882..a32f63a26 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.19beta01 - July 29, 2015 +libpng version 1.6.19beta02 - July 30, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 15e5c1f09..9821dd8a7 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@