diff --git a/ANNOUNCE b/ANNOUNCE index b7b5362cd..9d5e66fbc 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta41 - November 7, 2014 +Libpng 1.7.0beta42 - November 7, 2014 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.0beta41.tar.xz (LZMA-compressed, recommended) - 1.7.0beta41.tar.gz + 1.7.0beta42.tar.xz (LZMA-compressed, recommended) + 1.7.0beta42.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp170b41.7z (LZMA-compressed, recommended) - lp170b41.zip + lp170b42.7z (LZMA-compressed, recommended) + lp170b42.zip Other information: - 1.7.0beta41-README.txt - 1.7.0beta41-LICENSE.txt - libpng-1.7.0beta41-*.asc (armored detached GPG signatures) + 1.7.0beta42-README.txt + 1.7.0beta42-LICENSE.txt + libpng-1.7.0beta42-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.0): @@ -646,6 +646,9 @@ Version 1.7.0beta40 [November 6, 2014] Version 1.7.0beta41 [November 7, 2014] Added #ifdef PNG_16BIT_SUPPORTED/#endif around png_log16bit() and png_do_swap(). + Changed all "#endif /* PNG_FEATURE_SUPPORTED */" to "#endif /* FEATURE */" + +Version 1.7.0beta42 [November 7, 2014] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 4a8b9846a..357ea1af5 100644 --- a/CHANGES +++ b/CHANGES @@ -4935,6 +4935,9 @@ Version 1.7.0beta40 [November 6, 2014] Version 1.7.0beta41 [November 7, 2014] Added #ifdef PNG_16BIT_SUPPORTED/#endif around png_log16bit() and png_do_swap(). + Changed all "#endif /* PNG_FEATURE_SUPPORTED */" to "#endif /* FEATURE */" + +Version 1.7.0beta42 [November 7, 2014] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a7d403a2..01b1d6290 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -253,7 +253,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.0beta41 +# VERSION 17.${PNGLIB_RELEASE}.1.7.0beta42 VERSION 17.${PNGLIB_RELEASE}.0 SOVERSION 17 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index a10ed28d6..858038371 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.0beta41, November 7, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta42, November 7, 2014, are Copyright (c) 2004, 2006-2014 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 941951f04..609f4d02a 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta41 - November 7, 2014 (shared library 17.0) +README for libpng version 1.7.0beta42 - November 7, 2014 (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 a040a542c..1f33c2135 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.0beta41],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.7.0beta42],[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.0beta41 +PNGLIB_VERSION=1.7.0beta42 PNGLIB_MAJOR=1 PNGLIB_MINOR=7 PNGLIB_RELEASE=0 diff --git a/libpng-manual.txt b/libpng-manual.txt index e4cc392aa..f66d9b5c3 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.0beta41 - November 7, 2014 + libpng version 1.7.0beta42 - November 7, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.0beta41 - November 7, 2014 + libpng versions 0.97, January 1998, through 1.7.0beta42 - November 7, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5315,7 +5315,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.0beta41 are Y2K compliant. It is my belief that earlier +upward through 1.7.0beta42 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 5ee05eb4f..41701e76a 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "November 7, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta41 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta42 .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.0beta41 - November 7, 2014 + libpng version 1.7.0beta42 - November 7, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.0beta41 - November 7, 2014 + libpng versions 0.97, January 1998, through 1.7.0beta42 - November 7, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5809,7 +5809,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.0beta41 are Y2K compliant. It is my belief that earlier +upward through 1.7.0beta42 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 @@ -6073,7 +6073,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0beta41 - November 7, 2014: +Libpng version 1.7.0beta42 - November 7, 2014: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6096,7 +6096,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.7.0beta41, November 7, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta42, November 7, 2014, 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 605c4adb5..8c419bb79 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "November 7, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta41 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta42 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 43b8aacc4..bb92cefb7 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_0beta41 Your_png_h_is_not_version_1_7_0beta41; +typedef png_libpng_version_1_7_0beta42 Your_png_h_is_not_version_1_7_0beta42; /* 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 @@ -691,13 +691,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta41 - November 7, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta42 - November 7, 2014" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 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.0beta41 - November 7, 2014\ + return "libpng version 1.7.0beta42 - November 7, 2014\ Copyright (c) 1998-2014 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 5009eb20a..8cbcfc371 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta41 - November 7, 2014 + * libpng version 1.7.0beta42 - November 7, 2014 * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -11,7 +11,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.0beta41 - November 7, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.7.0beta42 - November 7, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -200,7 +200,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta41, November 7, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta42, November 7, 2014, are * Copyright (c) 2004, 2006-2013 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: @@ -318,7 +318,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.7.0beta41 are Y2K compliant. It is my belief that + * upward through 1.7.0beta42 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 @@ -380,9 +380,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.7.0beta41" +#define PNG_LIBPNG_VER_STRING "1.7.0beta42" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta41 - November 7, 2014\n" + " libpng version 1.7.0beta42 - November 7, 2014\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 @@ -396,7 +396,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 41 +#define PNG_LIBPNG_VER_BUILD 42 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -647,7 +647,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_0beta41; +typedef char* png_libpng_version_1_7_0beta42; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index d8575c822..77377012b 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta41 - November 7, 2014 + * libpng version 1.7.0beta42 - November 7, 2014 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index ecb47a561..72e3cd1a3 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -2920,7 +2920,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr, png_free(png_ptr, png_ptr->unknown_chunk.data); png_ptr->unknown_chunk.data = NULL; -#else /* !PNG_READ_UNKNOWN_CHUNKS_SUPPORTED */ +#else /* !READ_UNKNOWN_CHUNKS */ /* There is no support to read an unknown chunk, so just skip it. */ png_crc_finish(png_ptr, length); PNG_UNUSED(info_ptr) @@ -3156,7 +3156,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display) ((display)?display_mask[png][DEPTH_INDEX(depth)][pass>>1]:\ row_mask[png][DEPTH_INDEX(depth)][pass]) -#else /* !PNG_USE_COMPILE_TIME_MASKS */ +#else /* !USE_COMPILE_TIME_MASKS */ /* This is the runtime alternative: it seems unlikely that this will * ever be either smaller or faster than the compile time approach. */ diff --git a/pngset.c b/pngset.c index e0e53e659..b40b8d242 100644 --- a/pngset.c +++ b/pngset.c @@ -800,7 +800,7 @@ png_set_text_2(png_structrp png_ptr, png_inforp info_ptr, else lang_key_len = 0; } -# else /* PNG_iTXt_SUPPORTED */ +# else /* iTXt */ { png_chunk_report(png_ptr, "iTXt chunk not supported", PNG_CHUNK_WRITE_ERROR); diff --git a/pngtest.c b/pngtest.c index cac48d79b..f543a062a 100644 --- a/pngtest.c +++ b/pngtest.c @@ -781,7 +781,7 @@ write_chunks(png_structp write_ptr, int location) } } #endif /* WRITE */ -#else /* !PNG_READ_USER_CHUNKS_SUPPORTED */ +#else /* !READ_USER_CHUNKS */ # define write_chunks(pp,loc) ((void)0) #endif /* END of code to demonstrate user chunk support */ @@ -2008,4 +2008,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_0beta41 Your_png_h_is_not_version_1_7_0beta41; +typedef png_libpng_version_1_7_0beta42 Your_png_h_is_not_version_1_7_0beta42; diff --git a/pngwutil.c b/pngwutil.c index e6386c0a4..83c4f8405 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -2938,7 +2938,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) pc = (p + pc) < 0 ? -(p + pc) : p + pc; #endif p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c; -#else /* PNG_SLOW_PAETH */ +#else /* SLOW_PAETH */ p = a + b - c; pa = abs(p - a); pb = abs(p - b); diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 8d7438a92..17db85765 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta41 - November 7, 2014 +libpng version 1.7.0beta42 - November 7, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index c355c1686..ab2337d17 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@