From 033dd3f20afc41035246ef27ea39b6a08325f52a Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 17 Mar 2015 08:10:20 -0500 Subject: [PATCH] [libpng17] Bump version to 1.7.0beta58 --- ANNOUNCE | 20 +++++++++++--------- CHANGES | 4 +++- CMakeLists.txt | 2 +- LICENSE | 2 +- README | 2 +- configure.ac | 4 ++-- libpng-manual.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.c | 6 +++--- png.h | 18 +++++++++--------- 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 +- 24 files changed, 60 insertions(+), 56 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 2be6442e7..e84825c87 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta57 - March 17, 2015 +Libpng 1.7.0beta58 - March 17, 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. @@ -9,20 +9,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.7.0beta57.tar.xz (LZMA-compressed, recommended) - 1.7.0beta57.tar.gz + 1.7.0beta58.tar.xz (LZMA-compressed, recommended) + 1.7.0beta58.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp170b57.7z (LZMA-compressed, recommended) - lp170b57.zip + lp170b58.7z (LZMA-compressed, recommended) + lp170b58.zip Other information: - 1.7.0beta57-README.txt - 1.7.0beta57-LICENSE.txt - libpng-1.7.0beta57-*.asc (armored detached GPG signatures) + 1.7.0beta58-README.txt + 1.7.0beta58-LICENSE.txt + libpng-1.7.0beta58-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.0): @@ -750,13 +750,15 @@ Version 1.7.0beta56 [March 11, 2015] Updated CMakeLists.txt to add OSX framework, change YES/NO to ON/OFF for consistency, and remove some useless tests (Alexey Petruchik). -Version 1.7.0beta57 [March 17, 2015] +Version 1.7.0beta57 [March 16, 2015] Remove pnglibconf.h, pnglibconf.c, and pnglibconf.out instead of pnglibconf.* in "make clean" (Cosmin). Fix bug in calculation of maxbits, in png_write_sBIT, introduced in libpng-1.6.17beta01 (John Bowler). Revert change to png_default_read_data() made in libpng-1.7.0beta55. +Version 1.7.0beta58 [March 17, 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 3deaa5438..eab9234f2 100644 --- a/CHANGES +++ b/CHANGES @@ -5040,13 +5040,15 @@ Version 1.7.0beta56 [March 11, 2015] Updated CMakeLists.txt to add OSX framework, change YES/NO to ON/OFF for consistency, and remove some useless tests (Alexey Petruchik). -Version 1.7.0beta57 [March 17, 2015] +Version 1.7.0beta57 [March 16, 2015] Remove pnglibconf.h, pnglibconf.c, and pnglibconf.out instead of pnglibconf.* in "make clean" (Cosmin). Fix bug in calculation of maxbits, in png_write_sBIT, introduced in libpng-1.6.17beta01 (John Bowler). Revert change to png_default_read_data() made in libpng-1.7.0beta55. +Version 1.7.0beta58 [March 17, 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 6cc3d004c..d797376a2 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 17.${PNGLIB_RELEASE}.1.7.0beta57 +# VERSION 17.${PNGLIB_RELEASE}.1.7.0beta58 VERSION 17.${PNGLIB_RELEASE}.0 SOVERSION 17 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 04c5dd944..9874cdf8d 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.7.0beta57, March 17, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta58, March 17, 2015, are Copyright (c) 2004, 2006-2015 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors diff --git a/README b/README index b7782b8d6..df7c1a102 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta57 - March 17, 2015 (shared library 17.0) +README for libpng version 1.7.0beta58 - March 17, 2015 (shared library 17.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 adc9cb8a6..6c2de8c32 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.7.0beta57],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.7.0beta58],[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.7.0beta57 +PNGLIB_VERSION=1.7.0beta58 PNGLIB_MAJOR=1 PNGLIB_MINOR=7 PNGLIB_RELEASE=0 diff --git a/libpng-manual.txt b/libpng-manual.txt index b23f7a7c8..320c13af1 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.7.0beta57 - March 17, 2015 + libpng version 1.7.0beta58 - March 17, 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.7.0beta57 - March 17, 2015 + libpng versions 0.97, January 1998, through 1.7.0beta58 - March 17, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5342,7 +5342,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.7.0beta57 are Y2K compliant. It is my belief that earlier +upward through 1.7.0beta58 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 8cd3bceb2..48eb98a66 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "March 17, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta57 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta58 .SH SYNOPSIS \fB #include \fP @@ -494,7 +494,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.7.0beta57 - March 17, 2015 + libpng version 1.7.0beta58 - March 17, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -505,7 +505,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0beta57 - March 17, 2015 + libpng versions 0.97, January 1998, through 1.7.0beta58 - March 17, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5836,7 +5836,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.7.0beta57 are Y2K compliant. It is my belief that earlier +upward through 1.7.0beta58 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 @@ the first widely used release: 1.6.17beta01-06 16 10617 16.so.16.17[.0] 1.6.17rc01 16 10617 16.so.16.17[.0] 1.7.0alpha01-10 17 10700 17.so.17.0[.0] - 1.7.0beta01-57 17 10700 17.so.17.0[.0] + 1.7.0beta01-58 17 10700 17.so.17.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6147,7 +6147,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0beta57 - March 17, 2015: +Libpng version 1.7.0beta58 - March 17, 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). @@ -6170,7 +6170,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.7.0beta57, March 17, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta58, March 17, 2015, are Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors diff --git a/libpngpf.3 b/libpngpf.3 index fff59b6d5..89f14394d 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "March 17, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta57 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta58 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 2727f89a5..c594bc666 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_7_0beta57 Your_png_h_is_not_version_1_7_0beta57; +typedef png_libpng_version_1_7_0beta58 Your_png_h_is_not_version_1_7_0beta58; /* 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 @@ -688,13 +688,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta57 - March 17, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta58 - March 17, 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.0beta57 - March 17, 2015\ + return "libpng version 1.7.0beta58 - March 17, 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 553e189f2..c8889ada2 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta57, March 17, 2015 + * libpng version 1.7.0beta58, March 17, 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.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.7.0beta57, March 17, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.7.0beta58, March 17, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -216,7 +216,7 @@ * 1.6.17beta01-06 16 10617 16.so.16.17[.0] * 1.6.17rc01 16 10617 16.so.16.17[.0] * 1.7.0alpha01-10 17 10700 17.so.17.0[.0] - * 1.7.0beta01-57 17 10700 17.so.17.0[.0] + * 1.7.0beta01-58 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 @@ -248,7 +248,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta57, March 17, 2015, are + * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta58, March 17, 2015, are * Copyright (c) 2004, 2006-2015 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -366,7 +366,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.7.0beta57 are Y2K compliant. It is my belief that + * upward through 1.7.0beta58 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.7.0beta57" +#define PNG_LIBPNG_VER_STRING "1.7.0beta58" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta57 - March 17, 2015\n" + " libpng version 1.7.0beta58 - March 17, 2015\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 @@ -444,7 +444,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 57 +#define PNG_LIBPNG_VER_BUILD 58 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -697,7 +697,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_7_0beta57; +typedef char* png_libpng_version_1_7_0beta58; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index d26523878..2b670811f 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta57, March 17, 2015 + * libpng version 1.7.0beta58, March 17, 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 872ddf416..194639017 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_7_0beta57 Your_png_h_is_not_version_1_7_0beta57; +typedef png_libpng_version_1_7_0beta58 Your_png_h_is_not_version_1_7_0beta58; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index eee2bae87..309fd3bc1 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta57 - March 17, 2015 +libpng version 1.7.0beta58 - March 17, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 999c2ad20..2524c68ee 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@