diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2015-07-12 14:35:34 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2015-07-13 07:09:33 -0500 |
commit | be55943d456e56a9d3b7007f1a327d682090b377 (patch) | |
tree | ad57f4477ab719d8aff6c59c4e76febbdb829208 | |
parent | e0874e193431cfb87b957cf026e1fe5e264b3bae (diff) | |
download | libpng-1.6.18rc02.tar.gz |
[libpng16] Imported from libpng-1.6.18rc02.tarv1.6.18rc02
-rw-r--r-- | ANNOUNCE | 20 | ||||
-rw-r--r-- | CHANGES | 2 | ||||
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | LICENSE | 22 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | libpng-manual.txt | 8 | ||||
-rw-r--r-- | libpng.3 | 60 | ||||
-rw-r--r-- | libpngpf.3 | 4 | ||||
-rw-r--r-- | png.5 | 2 | ||||
-rw-r--r-- | png.c | 6 | ||||
-rw-r--r-- | png.h | 38 | ||||
-rw-r--r-- | pngconf.h | 2 | ||||
-rw-r--r-- | pngtest.c | 2 | ||||
-rw-r--r-- | projects/vstudio/readme.txt | 2 | ||||
-rw-r--r-- | projects/vstudio/zlib.props | 2 | ||||
-rw-r--r-- | scripts/README.txt | 10 | ||||
-rw-r--r-- | scripts/def.c | 2 | ||||
-rw-r--r-- | scripts/libpng-config-head.in | 2 | ||||
-rw-r--r-- | scripts/libpng.pc.in | 2 | ||||
-rw-r--r-- | scripts/makefile.ne12bsd | 2 | ||||
-rw-r--r-- | scripts/makefile.netbsd | 2 | ||||
-rw-r--r-- | scripts/makefile.openbsd | 2 | ||||
-rw-r--r-- | scripts/pnglibconf.h.prebuilt | 4 | ||||
-rw-r--r-- | scripts/symbols.def | 2 |
25 files changed, 105 insertions, 101 deletions
@@ -1,4 +1,4 @@ -Libpng 1.6.18rc01 - July 9, 2015 +Libpng 1.6.18rc02 - July 12, 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.18rc01.tar.xz (LZMA-compressed, recommended) - 1.6.18rc01.tar.gz + 1.6.18rc02.tar.xz (LZMA-compressed, recommended) + 1.6.18rc02.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1618r01.7z (LZMA-compressed, recommended) - lp1618r01.zip + lp1618r02.7z (LZMA-compressed, recommended) + lp1618r02.zip Other information: - 1.6.18rc01-README.txt - 1.6.18rc01-LICENSE.txt - libpng-1.6.18rc01-*.asc (armored detached GPG signatures) + 1.6.18rc02-README.txt + 1.6.18rc02-LICENSE.txt + libpng-1.6.18rc02-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.17): @@ -106,6 +106,10 @@ Version 1.6.18rc01 [July 9, 2015] Belatedly added Mans Rullgard and James Yu to the list of Contributing Authors. +Version 1.6.18rc02 [July 12, 2015] + Restored unused WEIGHTED_FILTER macros removed at libpng-1.6.18beta08 + to png.h to avoid compatibility warnings. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement @@ -5294,6 +5294,8 @@ Version 1.6.18beta09 [July 5, 2015] Version 1.6.18rc01 [July 9, 2015] Belatedly added Mans Rullgard and James Yu to the list of Contributing Authors. + +Version 1.6.18rc02 [July 12, 2015] Restored unused WEIGHTED_FILTER macros removed at libpng-1.6.18beta08 to png.h to avoid compatibility warnings. diff --git a/CMakeLists.txt b/CMakeLists.txt index 4117eee5b..520e54cef 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.18rc01 +# VERSION 16.${PNGLIB_RELEASE}.1.6.18rc02 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) @@ -10,10 +10,10 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.6.18rc01, July 9, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.6.18rc02, July 12, 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 +with the following individuals added to the list of Contributing Authors: Simon-Pierre Cadieux Eric S. Raymond @@ -32,7 +32,7 @@ and with the following additions to the disclaimer: the user. libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are -Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are distributed according +Copyright (c) 1998-2000 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-0.96, with the following individuals added to the list of Contributing Authors: @@ -42,7 +42,7 @@ individuals added to the list of Contributing Authors: libpng versions 0.89, June 1996, through 0.96, May 1997, are Copyright (c) 1996-1997 Andreas Dilger, and are -distributed according to the same disclaimer and license as libpng-0.90, +distributed according to the same disclaimer and license as libpng-0.88, with the following individuals added to the list of Contributing Authors: John Bowler @@ -76,13 +76,13 @@ Permission is hereby granted to use, copy, modify, and distribute this source code, or portions hereof, for any purpose, without fee, subject to the following restrictions: -1. The origin of this source code must not be misrepresented. + 1. The origin of this source code must not be misrepresented. -2. Altered versions must be plainly marked as such and must not - be misrepresented as being the original source. + 2. Altered versions must be plainly marked as such and must not + be misrepresented as being the original source. -3. This Copyright notice may not be removed or altered from any - source or altered source distribution. + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. The Contributing Authors and Group 42, Inc. specifically permit, without fee, and encourage the use of this source code as a component to @@ -93,7 +93,7 @@ appreciated. A "png_get_copyright" function is available, for convenient use in "about" boxes and the like: - printf("%s",png_get_copyright(NULL)); + printf("%s", png_get_copyright(NULL)); Also, the PNG logo (in PNG format, of course) is supplied in the files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). @@ -104,4 +104,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 9, 2015 +July 12, 2015 @@ -1,4 +1,4 @@ -README for libpng version 1.6.18rc01 - July 9, 2015 (shared library 16.0) +README for libpng version 1.6.18rc02 - July 12, 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 e2922caaf..d3009f208 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.18rc01],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.18rc02],[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.18rc01 +PNGLIB_VERSION=1.6.18rc02 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=18 diff --git a/libpng-manual.txt b/libpng-manual.txt index cdf34aa8d..347727a82 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.18rc01 - July 9, 2015 + libpng version 1.6.18rc02 - July 12, 2015 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 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.18rc01 - July 9, 2015 + libpng versions 0.97, January 1998, through 1.6.18rc02 - July 12, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5297,13 +5297,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -July 9, 2015 +July 12, 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.18rc01 are Y2K compliant. It is my belief that earlier +upward through 1.6.18rc02 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 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "July 9, 2015" +.TH LIBPNG 3 "July 12, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.18rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.18rc02 .SH SYNOPSIS \fB #include <png.h>\fP @@ -504,7 +504,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.18rc01 - July 9, 2015 + libpng version 1.6.18rc02 - July 12, 2015 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.18rc01 - July 9, 2015 + libpng versions 0.97, January 1998, through 1.6.18rc02 - July 12, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5801,13 +5801,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -July 9, 2015 +July 12, 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.18rc01 are Y2K compliant. It is my belief that earlier +upward through 1.6.18rc02 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 @@ -6063,7 +6063,7 @@ the first widely used release: 1.6.17rc01-06 16 10617 16.so.16.17[.0] 1.6.17 16 10617 16.so.16.17[.0] 1.6.18beta01-09 16 10618 16.so.16.18[.0] - 1.6.18rc01 16 10618 16.so.16.18[.0] + 1.6.18rc01-02 16 10618 16.so.16.18[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6120,7 +6120,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.18rc01 - July 9, 2015: +Libpng version 1.6.18rc02 - July 12, 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). @@ -6143,40 +6143,39 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.6.18rc01, July 9, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.6.18rc02, July 12, 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: Simon-Pierre Cadieux Eric S. Raymond - Cosmin Truta Mans Rullgard + Cosmin Truta Gilles Vollant James Yu and with the following additions to the disclaimer: - There is no warranty against interference with your - enjoyment of the library or against infringement. - There is no warranty that our efforts or the library - will fulfill any of your particular purposes or needs. - This library is provided with all faults, and the entire - risk of satisfactory quality, performance, accuracy, and - effort is with the user. + There is no warranty against interference with your enjoyment of the + library or against infringement. There is no warranty that our + efforts or the library will fulfill any of your particular purposes + or needs. This library is provided with all faults, and the entire + risk of satisfactory quality, performance, accuracy, and effort is with + the user. libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are -Copyright (c) 1998, 1999 Glenn Randers-Pehrson -Distributed according to the same disclaimer and license as libpng-0.96, -with the following individuals added to the list of Contributing Authors: +Copyright (c) 1998-2000 Glenn Randers-Pehrson, and are distributed according +to the same disclaimer and license as libpng-0.96, with the following +individuals added to the list of Contributing Authors: Tom Lane Glenn Randers-Pehrson Willem van Schaik libpng versions 0.89, June 1996, through 0.96, May 1997, are -Copyright (c) 1996, 1997 Andreas Dilger -Distributed according to the same disclaimer and license as libpng-0.88, +Copyright (c) 1996-1997 Andreas Dilger, and are +distributed according to the same disclaimer and license as libpng-0.88, with the following individuals added to the list of Contributing Authors: John Bowler @@ -6187,7 +6186,7 @@ with the following individuals added to the list of Contributing Authors: Tom Tanner libpng versions 0.5, May 1995, through 0.88, January 1996, are -Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. +Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. For the purposes of this copyright and license, "Contributing Authors" is defined as the following set of individuals: @@ -6210,13 +6209,13 @@ Permission is hereby granted to use, copy, modify, and distribute this source code, or portions hereof, for any purpose, without fee, subject to the following restrictions: -1. The origin of this source code must not be misrepresented. + 1. The origin of this source code must not be misrepresented. -2. Altered versions must be plainly marked as such and - must not be misrepresented as being the original source. + 2. Altered versions must be plainly marked as such and must not + be misrepresented as being the original source. -3. This Copyright notice may not be removed or altered from - any source or altered source distribution. + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. The Contributing Authors and Group 42, Inc. specifically permit, without fee, and encourage the use of this source code as a component to @@ -6224,11 +6223,10 @@ supporting the PNG file format in commercial products. If you use this source code in a product, acknowledgment is not required but would be appreciated. - A "png_get_copyright" function is available, for convenient use in "about" boxes and the like: - printf("%s",png_get_copyright(NULL)); + printf("%s", png_get_copyright(NULL)); Also, the PNG logo (in PNG format, of course) is supplied in the files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). @@ -6239,7 +6237,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 9, 2015 +July 12, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 48ac77a30..7cc32e203 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "July 9, 2015" +.TH LIBPNGPF 3 "July 12, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.18rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.18rc02 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" @@ -1,4 +1,4 @@ -.TH PNG 5 "July 9, 2015" +.TH PNG 5 "July 12, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -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_18rc01 Your_png_h_is_not_version_1_6_18rc01; +typedef png_libpng_version_1_6_18rc02 Your_png_h_is_not_version_1_6_18rc02; /* 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.18rc01 - July 9, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.6.18rc02 - July 12, 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.18rc01 - July 9, 2015\ + return "libpng version 1.6.18rc02 - July 12, 2015\ Copyright (c) 1998-2015 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.18rc01, July 9, 2015 + * libpng version 1.6.18rc02, July 12, 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.18rc01, July 9, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.6.18rc02, July 12, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -217,7 +217,7 @@ * 1.6.17rc01-06 16 10617 16.so.16.17[.0] * 1.6.17 16 10617 16.so.16.17[.0] * 1.6.18beta01-09 16 10618 16.so.16.18[.0] - * 1.6.18rc01 16 10618 16.so.16.18[.0] + * 1.6.18rc01-02 16 10618 16.so.16.18[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -249,7 +249,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.6.18rc01, July 9, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.6.18rc02, July 12, 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: @@ -271,17 +271,17 @@ * the user. * * libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are - * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are - * distributed according to the same disclaimer and license as libpng-0.96, - * with the following individuals added to the list of Contributing Authors: + * Copyright (c) 1998-2000 Glenn Randers-Pehrson, and are distributed according + * to the same disclaimer and license as libpng-0.96, with the following + * individuals added to the list of Contributing Authors: * * Tom Lane * Glenn Randers-Pehrson * Willem van Schaik * * libpng versions 0.89, June 1996, through 0.96, May 1997, are - * Copyright (c) 1996, 1997 Andreas Dilger - * Distributed according to the same disclaimer and license as libpng-0.88, + * Copyright (c) 1996-1997 Andreas Dilger, and are + * distributed according to the same disclaimer and license as libpng-0.88, * with the following individuals added to the list of Contributing Authors: * * John Bowler @@ -292,7 +292,7 @@ * Tom Tanner * * libpng versions 0.5, May 1995, through 0.88, January 1996, are - * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * For the purposes of this copyright and license, "Contributing Authors" * is defined as the following set of individuals: @@ -320,8 +320,8 @@ * 2. Altered versions must be plainly marked as such and must not * be misrepresented as being the original source. * - * 3. This Copyright notice may not be removed or altered from - * any source or altered source distribution. + * 3. This Copyright notice may not be removed or altered from any + * source or altered source distribution. * * The Contributing Authors and Group 42, Inc. specifically permit, without * fee, and encourage the use of this source code as a component to @@ -334,7 +334,7 @@ * A "png_get_copyright" function is available, for convenient use in "about" * boxes and the like: * - * printf("%s", png_get_copyright(NULL)); + * printf("%s", png_get_copyright(NULL)); * * Also, the PNG logo (in PNG format, of course) is supplied in the * files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). @@ -358,13 +358,13 @@ * Y2K compliance in libpng: * ========================= * - * July 9, 2015 + * July 12, 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.18rc01 are Y2K compliant. It is my belief that + * upward through 1.6.18rc02 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 @@ -426,9 +426,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.18rc01" +#define PNG_LIBPNG_VER_STRING "1.6.18rc02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.18rc01 - July 9, 2015\n" + " libpng version 1.6.18rc02 - July 12, 2015\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -442,7 +442,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 @@ -572,7 +572,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_18rc01; +typedef char* png_libpng_version_1_6_18rc02; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.18rc01, (PENDING RELEASE) + * libpng version 1.6.18rc02, (PENDING RELEASE) * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -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_18rc01 Your_png_h_is_not_version_1_6_18rc01; +typedef png_libpng_version_1_6_18rc02 Your_png_h_is_not_version_1_6_18rc02; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 8ac6d5c14..9ed518c81 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.18rc01 - July 9, 2015 +libpng version 1.6.18rc02 - July 12, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 85c9c3f79..cf3c6a78c 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@ <!-- * zlib.props - location of zlib source * - * libpng version 1.6.18rc01 - July 9, 2015 + * libpng version 1.6.18rc02 - July 12, 2015 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * diff --git a/scripts/README.txt b/scripts/README.txt index a129f1da4..915f7aa76 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,9 +1,9 @@ -Makefiles for libpng version 1.6.18rc01 - July 9, 2015 +Makefiles for libpng version 1.6.18rc02 - July 12, 2015 pnglibconf.h.prebuilt => Stores configuration settings makefile.linux => Linux/ELF makefile - (gcc, creates libpng16.so.16.1.6.18rc01) + (gcc, creates libpng16.so.16.1.6.18rc02) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -33,12 +33,12 @@ pnglibconf.h.prebuilt => Stores configuration settings makefile.os2 => OS/2 Makefile (gcc and emx, requires libpng.def) makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.sggcc => Silicon Graphics (gcc, - creates libpng16.so.16.1.6.18rc01) + creates libpng16.so.16.1.6.18rc02) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng16.so.16.1.6.18rc01) + creates libpng16.so.16.1.6.18rc02) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng16.so.16.1.6.18rc01) + creates libpng16.so.16.1.6.18rc02) makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.sunos => Sun makefile makefile.32sunu => Sun Ultra 32-bit makefile diff --git a/scripts/def.c b/scripts/def.c index 468f4aaa5..14c6cce79 100644 --- a/scripts/def.c +++ b/scripts/def.c @@ -21,7 +21,7 @@ PNG_DFN "OS2 DESCRIPTION "PNG image compression library"" PNG_DFN "OS2 CODE PRELOAD MOVEABLE DISCARDABLE" PNG_DFN "" PNG_DFN "EXPORTS" -PNG_DFN ";Version 1.6.18rc01" +PNG_DFN ";Version 1.6.18rc02" #define PNG_EXPORTA(ordinal, type, name, args, attributes)\ PNG_DFN "@" SYMBOL_PREFIX "@@" name "@" diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index fbcfe2b7a..ed00851bc 100644 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.6.18rc01 +version=1.6.18rc02 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index fb22c1dbc..90e9f8552 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng16 Name: libpng Description: Loads and saves PNG files -Version: 1.6.18rc01 +Version: 1.6.18rc02 Libs: -L${libdir} -lpng16 Cflags: -I${includedir} diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 2dd540c1a..dba7720a2 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng16 LIB= png16 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.6.18rc01 +SHLIB_MINOR= 1.6.18rc02 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index 5f6a79189..949572968 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include LIB= png SHLIB_MAJOR= 16 -SHLIB_MINOR= 1.6.18rc01 +SHLIB_MINOR= 1.6.18rc02 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 64aed914b..bedc4da83 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 16 -SHLIB_MINOR= 1.6.18rc01 +SHLIB_MINOR= 1.6.18rc02 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt index e8cea9f9e..17b2d90d0 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -1,8 +1,8 @@ -/* libpng 1.6.18rc01 STANDARD API DEFINITION */ +/* libpng 1.6.18rc02 STANDARD API DEFINITION */ /* pnglibconf.h - library build configuration */ -/* Libpng version 1.6.18rc01 - July 9, 2015 */ +/* Libpng version 1.6.18rc02 - July 12, 2015 */ /* Copyright (c) 1998-2014 Glenn Randers-Pehrson */ diff --git a/scripts/symbols.def b/scripts/symbols.def index b7daff027..b6ed381d7 100644 --- a/scripts/symbols.def +++ b/scripts/symbols.def @@ -1,4 +1,4 @@ -;Version 1.6.18rc01 +;Version 1.6.18rc02 ;-------------------------------------------------------------- ; LIBPNG symbol list as a Win32 DEF file ; Contains all the symbols that can be exported from libpng |