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/png.c b/png.c index 72cde13b5..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."; @@ -3627,9 +3627,9 @@ png_gamma_8bit_correct(unsigned int value, png_fixed_point gamma_val) * convert this to a floating point value. This includes values that * would overflow if 'value' were to be converted to 'int'. * - * Apparently GCC, however, does an intermediate convertion to (int) + * Apparently GCC, however, does an intermediate conversion to (int) * on some (ARM) but not all (x86) platforms, possibly because of - * hardware FP limitations. (E.g. if the hardware convertion always + * hardware FP limitations. (E.g. if the hardware conversion always * assumes the integer register contains a signed value.) This results * in ANSI-C undefined behavior for large values. * @@ -3637,7 +3637,7 @@ png_gamma_8bit_correct(unsigned int value, png_fixed_point gamma_val) * conformant and therefore compile spurious extra code for the large * values. * - * We can be reasonably sure that an unsigned to float convertion + * We can be reasonably sure that an unsigned to float conversion * won't be faster than an int to float one. Therefore this code * assumes responsibility for the undefined behavior, which it knows * can't happen because of the check above. @@ -3671,7 +3671,7 @@ png_gamma_16bit_correct(unsigned int value, png_fixed_point gamma_val) { # ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED /* The same (unsigned int)->(double) constraints apply here as above, - * however in this case the (unsigned int) to (int) convertion can + * however in this case the (unsigned int) to (int) conversion can * overflow on an ANSI-C90 compliant system so the cast needs to ensure * that this is not possible. */ diff --git a/png.h b/png.h index 968c09650..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 6, 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 6, 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 6, 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: @@ -312,13 +312,13 @@ * Y2K compliance in libpng: * ========================= * - * November 6, 2014 + * November 7, 2014 * * 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 + * 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 6, 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 d94bad3bd..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 6, 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)