diff --git a/ANNOUNCE b/ANNOUNCE index 16dbd6fe0..42ec160a5 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.11beta06 - May 7, 2014 +Libpng 1.6.11beta06 - May 10, 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. @@ -49,10 +49,11 @@ Version 1.6.11beta03 [April 6, 2014] Version 1.6.11beta04 [April 19, 2014] Made progressive reading of interlaced images consistent with the - behavior of the sequential reader and consistent with the manual, - by moving some code out of the PNG_READ_INTERLACING_SUPPORTED blocks. - The row_callback now receives the proper pass number and unexpanded rows, - when png_combine_row is not used or not built, + behavior of the sequential reader and consistent with the manual, by + moving some code out of the PNG_READ_INTERLACING_SUPPORTED blocks. The + row_callback now receives the proper pass number and unexpanded rows, when + png_combine_row() isn't built or used, and png_set_interlace_handling() + is not called. Allow PNG_sRGB_PROFILE_CHECKING = (-1) to mean no sRGB profile checking. Version 1.6.11beta05 [April 26, 2014] @@ -61,7 +62,7 @@ Version 1.6.11beta05 [April 26, 2014] "Not recognizing known sRGB profile that has been edited" warning for ICC V2 profiles that lack the MD5 signature in the profile header. -Version 1.6.11beta06 [May 7, 2014] +Version 1.6.11beta06 [May 10, 2014] Added PNG_SKIP_sRGB_CHECK_PROFILE choice for png_set_option(). Send comments/corrections/commendations to png-mng-implement at lists.sf.net diff --git a/CHANGES b/CHANGES index 9b2f4c29e..4d1a808ca 100644 --- a/CHANGES +++ b/CHANGES @@ -4900,10 +4900,11 @@ Version 1.6.11beta03 [April 6, 2014] Version 1.6.11beta04 [April 19, 2014] Made progressive reading of interlaced images consistent with the - behavior of the sequential reader and consistent with the manual, - by moving some code out of the PNG_READ_INTERLACING_SUPPORTED blocks. - The row_callback now receives the proper pass number and unexpanded rows, - when png_combine_row is not used or not built, + behavior of the sequential reader and consistent with the manual, by + moving some code out of the PNG_READ_INTERLACING_SUPPORTED blocks. The + row_callback now receives the proper pass number and unexpanded rows, when + png_combine_row() isn't built or used, and png_set_interlace_handling() + is not called. Allow PNG_sRGB_PROFILE_CHECKING = (-1) to mean no sRGB profile checking. Version 1.6.11beta05 [April 26, 2014] @@ -4912,7 +4913,7 @@ Version 1.6.11beta05 [April 26, 2014] "Not recognizing known sRGB profile that has been edited" warning for ICC V2 profiles that lack the MD5 signature in the profile header. -Version 1.6.11beta06 [May 7, 2014] +Version 1.6.11beta06 [May 10, 2014] Added PNG_SKIP_sRGB_CHECK_PROFILE choice for png_set_option(). Send comments/corrections/commendations to png-mng-implement at lists.sf.net diff --git a/libpng-manual.txt b/libpng-manual.txt index 52a2c2328..5d6dc8cbc 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.11beta06 - May 7, 2014 + libpng version 1.6.11beta06 - May 10, 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.11beta06 - May 7, 2014 + libpng versions 0.97, January 1998, through 1.6.11beta06 - May 10, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5045,6 +5045,10 @@ means of png_set_option(ping, PNG_SKIP_sRGB_CHECK_PROFILE, PNG_OPTION_ON); +It's not a good idea to do this if you are using the "simplified API", +which needs to be able to recognize an sRGB profile conveyed via the iCCP +chunk. + The PNG spec requirement that only grayscale profiles may appear in images with color type 0 or 4 and that even if the image only contains gray pixels, only RGB profiles may appear in images with color type 2, 3, or 6, is now @@ -5269,7 +5273,7 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -May 7, 2014 +May 10, 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 1fd5b1b02..bd0d62e83 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "May 7, 2014" +.TH LIBPNG 3 "May 10, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.11beta06 .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.11beta06 - May 7, 2014 + libpng version 1.6.11beta06 - May 10, 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.11beta06 - May 7, 2014 + libpng versions 0.97, January 1998, through 1.6.11beta06 - May 10, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5549,6 +5549,10 @@ means of png_set_option(ping, PNG_SKIP_sRGB_CHECK_PROFILE, PNG_OPTION_ON); +It's not a good idea to do this if you are using the "simplified API", +which needs to be able to recognize an sRGB profile conveyed via the iCCP +chunk. + The PNG spec requirement that only grayscale profiles may appear in images with color type 0 or 4 and that even if the image only contains gray pixels, only RGB profiles may appear in images with color type 2, 3, or 6, is now @@ -5773,7 +5777,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -May 7, 2014 +May 10, 2014 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6070,7 +6074,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.11beta06 - May 7, 2014: +Libpng version 1.6.11beta06 - May 10, 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). @@ -6093,7 +6097,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.11beta06, May 7, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.11beta06, May 10, 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 @@ -6192,7 +6196,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 7, 2014 +May 10, 2014 .\" end of man page diff --git a/pngtrans.c b/pngtrans.c index 98f75d583..b5ea49bc5 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -328,6 +328,9 @@ png_do_swap(png_row_infop row_info, png_bytep row) for (i = 0; i < istop; i++, rp += 2) { #ifdef PNG_BUILTIN_BSWAP16_SUPPORTED + /* Feature added to libpng-1.6.11 for testing purposes, not + * enabled by default. + */ *(png_uint_16*)rp = __builtin_bswap16(*(png_uint_16*)rp); #else png_byte t = *rp;