diff --git a/ANNOUNCE b/ANNOUNCE index 92db517b6..2250d0fef 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.11beta05 - April 25, 2014 +Libpng 1.6.11beta05 - April 26, 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. @@ -55,8 +55,11 @@ Version 1.6.11beta04 [April 19, 2014] when png_combine_row is not used or not built, Allow PNG_sRGB_PROFILE_CHECKING = (-1) to mean no sRGB profile checking. -Version 1.6.11beta05 [April 25, 2014] +Version 1.6.11beta05 [April 26, 2014] Do not reject ICC V2 profiles that lack padding (Kai-Uwe Behrmann). + Relocated closing bracket of the sRGB profile test loop to avoid getting + "Not recognizing known sRGB profile that has been edited" warning for + ICC V2 profiles that lack the MD5 signature in the profile header. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 1b85bb2d3..5a0d8f865 100644 --- a/CHANGES +++ b/CHANGES @@ -4906,8 +4906,11 @@ Version 1.6.11beta04 [April 19, 2014] when png_combine_row is not used or not built, Allow PNG_sRGB_PROFILE_CHECKING = (-1) to mean no sRGB profile checking. -Version 1.6.11beta05 [April 25, 2014] +Version 1.6.11beta05 [April 26, 2014] Do not reject ICC V2 profiles that lack padding (Kai-Uwe Behrmann). + Relocated closing bracket of the sRGB profile test loop to avoid getting + "Not recognizing known sRGB profile that has been edited" warning for + ICC V2 profiles that lack the MD5 signature in the profile header. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/LICENSE b/LICENSE index cd698e0da..e125488bd 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.6.11beta05, April 21, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.11beta05, April 26, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 21, 2014 +April 26, 2014 diff --git a/README b/README index 78f05aed5..3b7dfcb66 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.11beta05 - April 21, 2014 (shared library 16.0) +README for libpng version 1.6.11beta05 - April 26, 2014 (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/libpng-manual.txt b/libpng-manual.txt index 8b605b3a0..85da41a86 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.11beta05 - April 21, 2014 + libpng version 1.6.11beta05 - April 26, 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.6.11beta05 - April 21, 2014 + libpng versions 0.97, January 1998, through 1.6.11beta05 - April 26, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5261,7 +5261,7 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -April 21, 2014 +April 26, 2014 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/libpng.3 b/libpng.3 index 25326f404..1110fd21b 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "April 21, 2014" +.TH LIBPNG 3 "April 26, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.11beta05 .SH SYNOPSIS @@ -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.11beta05 - April 21, 2014 + libpng version 1.6.11beta05 - April 26, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.11beta05 - April 21, 2014 + libpng versions 0.97, January 1998, through 1.6.11beta05 - April 26, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5765,7 +5765,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -April 21, 2014 +April 26, 2014 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6062,7 +6062,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.11beta05 - April 21, 2014: +Libpng version 1.6.11beta05 - April 26, 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). @@ -6085,7 +6085,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.11beta05, April 21, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.11beta05, April 26, 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 @@ -6184,7 +6184,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 21, 2014 +April 26, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 390efb4f9..39bb93770 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "April 21, 2014" +.TH LIBPNGPF 3 "April 26, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.11beta05 (private functions) diff --git a/png.5 b/png.5 index e94653c47..0eac2883d 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "April 21, 2014" +.TH PNG 5 "April 26, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 9a4073e70..15596f7b0 100644 --- a/png.c +++ b/png.c @@ -773,13 +773,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.11beta05 - April 24, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.11beta05 - April 26, 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.6.11beta05 - April 24, 2014\ + return "libpng version 1.6.11beta05 - April 26, 2014\ Copyright (c) 1998-2014 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -2295,7 +2295,6 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr, return 1+png_sRGB_checks[i].is_broken; } } - } # if PNG_sRGB_PROFILE_CHECKS > 0 /* The signature matched, but the profile had been changed in some @@ -2307,6 +2306,7 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr, PNG_CHUNK_WARNING); break; # endif + } } } diff --git a/png.h b/png.h index 4f4d5a9e3..b62b4a2a4 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.11beta05 - April 21, 2014 + * libpng version 1.6.11beta05 - April 26, 2014 * Copyright (c) 1998-2014 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.6.11beta05 - April 21, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.11beta05 - April 26, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -227,7 +227,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.11beta05, April 21, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.11beta05, April 26, 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: @@ -339,7 +339,7 @@ * Y2K compliance in libpng: * ========================= * - * April 21, 2014 + * April 26, 2014 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -409,7 +409,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.11beta05" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.11beta05 - April 21, 2014\n" + " libpng version 1.6.11beta05 - April 26, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index 985e02342..840374dcd 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.11beta05 - April 21, 2014 + * libpng version 1.6.11beta05 - April 26, 2014 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 03439925c..5465ce5c4 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.11beta05 - April 21, 2014 +libpng version 1.6.11beta05 - April 26, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index c0dfc5e58..11f630b90 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@