diff --git a/ANNOUNCE b/ANNOUNCE index 998b6de2c..9824fba19 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.22rc02 - May 17, 2016 +Libpng 1.6.22rc03 - May 18, 2016 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.22rc02.tar.xz (LZMA-compressed, recommended) - 1.6.22rc02.tar.gz + 1.6.22rc03.tar.xz (LZMA-compressed, recommended) + 1.6.22rc03.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1622r02.7z (LZMA-compressed, recommended) - lp1622r02.zip + lp1622r03.7z (LZMA-compressed, recommended) + lp1622r03.zip Other information: - 1.6.22rc02-README.txt - 1.6.22rc02-LICENSE.txt - libpng-1.6.22rc02-*.asc (armored detached GPG signatures) + 1.6.22rc03-README.txt + 1.6.22rc03-LICENSE.txt + libpng-1.6.22rc03-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.21): @@ -102,13 +102,13 @@ Version 1.6.22beta06 [May 5, 2016] Version 1.6.22rc01 [May 14, 2016] No changes. -Version 1.6.22rc02 [May 17, 2016] +Version 1.6.22rc02 [May 18, 2016] Removed contrib/timepng from default build; it does not build on platforms that don't supply clock_gettime(). Check for CLOCK_PROCESS_CPUTIME_ID when building /contrib/libtests/timepng. Version 1.6.22rc03 [May 16, 2016] - Restored contrib/timepng to default build but check for check for presence + Restored contrib/timepng to default build but check for the presence of clock_gettime() in configure.ac and Makefile.am. Send comments/corrections/commendations to png-mng-implement at lists.sf.net diff --git a/CHANGES b/CHANGES index 707dd95ee..f8c706b62 100644 --- a/CHANGES +++ b/CHANGES @@ -5566,8 +5566,8 @@ Version 1.6.22rc02 [May 16, 2016] Removed contrib/timepng from default build; it does not build on platforms that don't supply clock_gettime(). -Version 1.6.22rc03 [May 17, 2016] - Restored contrib/timepng to default build but check for check for presence +Version 1.6.22rc03 [May 18, 2016] + Restored contrib/timepng to default build but check for the presence of clock_gettime() in configure.ac and Makefile.am. Send comments/corrections/commendations to png-mng-implement at lists.sf.net diff --git a/CMakeLists.txt b/CMakeLists.txt index a5b06c63e..552475667 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -696,7 +696,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.22rc02 +# VERSION 16.${PNGLIB_RELEASE}.1.6.22rc03 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index f13b2e706..248e8dd60 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.22rc02, May 16, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.22rc03, May 18, 2016 are Copyright (c) 2000-2002, 2004, 2006-2016 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 @@ -127,4 +127,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 16, 2016 +May 18, 2016 diff --git a/README b/README index 7bd0414c8..61dfd2e39 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.22rc02 - May 16, 2016 (shared library 16.0) +README for libpng version 1.6.22rc03 - May 18, 2016 (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 37ef0a14e..55b093526 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.22rc02],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.22rc03],[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.22rc02 +PNGLIB_VERSION=1.6.22rc03 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=22 diff --git a/contrib/libtests/timepng.c b/contrib/libtests/timepng.c index 4073ab6ef..1aa11e2f5 100644 --- a/contrib/libtests/timepng.c +++ b/contrib/libtests/timepng.c @@ -44,8 +44,10 @@ # define voidcast(type, value) (value) #endif /* __cplusplus */ -#if ((defined(PNG_SEQUENTIAL_READ_SUPPORTED)) && defined(PNG_STDIO_SUPPORTED)\ - && defined(PNG_EASY_ACCESS_SUPPORTED) && defined(PNG_INFO_IMAGE_SUPPORTED)) +#if defined (CLOCK_PROCESS_CPUTIME_ID) && \ + defined (PNG_SEQUENTIAL_READ_SUPPORTED) && defined(PNG_STDIO_SUPPORTED) \ + && defined(PNG_EASY_ACCESS_SUPPORTED) && defined(PNG_INFO_IMAGE_SUPPORTED) + typedef struct { FILE *input; diff --git a/libpng-manual.txt b/libpng-manual.txt index 170dfe62f..b51b3c5d2 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.22rc02 - May 16, 2016 + libpng version 1.6.22rc03 - May 18, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 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.22rc02 - May 16, 2016 + libpng versions 0.97, January 1998, through 1.6.22rc03 - May 18, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5345,7 +5345,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.22rc02 are Y2K compliant. It is my belief that earlier +upward through 1.6.22rc03 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 15b7f8d6b..d79a79de7 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "May 16, 2016" +.TH LIBPNG 3 "May 18, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.22rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.22rc03 .SH SYNOPSIS \fB #include \fP @@ -510,7 +510,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.22rc02 - May 16, 2016 + libpng version 1.6.22rc03 - May 18, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -521,7 +521,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.22rc02 - May 16, 2016 + libpng versions 0.97, January 1998, through 1.6.22rc03 - May 18, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5855,7 +5855,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.22rc02 are Y2K compliant. It is my belief that earlier +upward through 1.6.22rc03 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 @@ -6013,7 +6013,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.22rc02 - May 16, 2016: +Libpng version 1.6.22rc03 - May 18, 2016: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6038,7 +6038,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.22rc02, May 16, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.22rc03, May 18, 2016 are Copyright (c) 2000-2002, 2004, 2006-2016 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 @@ -6163,7 +6163,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 16, 2016 +May 18, 2016 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 4e91e0335..80f2cc914 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "May 16, 2016" +.TH LIBPNGPF 3 "May 18, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.22rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.22rc03 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 98c92e98b..13aa46003 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "May 16, 2016" +.TH PNG 5 "May 18, 2016" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 9befc5f2b..453a34b75 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_22rc02 Your_png_h_is_not_version_1_6_22rc02; +typedef png_libpng_version_1_6_22rc03 Your_png_h_is_not_version_1_6_22rc03; /* 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 @@ -775,14 +775,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.22rc02 - May 16, 2016" PNG_STRING_NEWLINE \ + "libpng version 1.6.22rc03 - May 18, 2016" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2016 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.22rc02 - May 16, 2016\ + return "libpng version 1.6.22rc03 - May 18, 2016\ Copyright (c) 1998-2002,2004,2006-2016 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 d40b4087b..0d3bffd0f 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.22rc02, May 16, 2016 + * libpng version 1.6.22rc03, May 18, 2016 * * Copyright (c) 1998-2002,2004,2006-2016 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.22rc02, May 16, 2016: + * libpng versions 0.97, January 1998, through 1.6.22rc03, May 18, 2016: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -29,7 +29,7 @@ * files that are distributed with libpng have other copyright owners and * are released under other open source licenses. * - * libpng versions 1.0.7, July 1, 2000 through 1.6.22rc02, May 16, 2016 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.22rc03, May 18, 2016 are * Copyright (c) 2000-2002, 2004, 2006-2016 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 @@ -245,13 +245,13 @@ * Y2K compliance in libpng: * ========================= * - * May 16, 2016 + * May 18, 2016 * * 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.22rc02 are Y2K compliant. It is my belief that + * upward through 1.6.22rc03 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 @@ -313,9 +313,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.22rc02" +#define PNG_LIBPNG_VER_STRING "1.6.22rc03" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.22rc02 - May 16, 2016\n" + " libpng version 1.6.22rc03 - May 18, 2016\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -329,7 +329,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 02 +#define PNG_LIBPNG_VER_BUILD 03 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -464,7 +464,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_22rc02; +typedef char* png_libpng_version_1_6_22rc03; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 5f1533bcc..7a0f1c032 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.22rc02, May 16, 2016 + * libpng version 1.6.22rc03, May 18, 2016 * * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index d3cd55a3f..33334f65f 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2079,4 +2079,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_22rc02 Your_png_h_is_not_version_1_6_22rc02; +typedef png_libpng_version_1_6_22rc03 Your_png_h_is_not_version_1_6_22rc03; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index 21d0161e9..700d7a871 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.22rc02 - May 16, 2016 +libpng version 1.6.22rc03 - May 18, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 77e76c4a3..49b3d133e 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@