From 79b7e4e621fd611df658ec24a07080708fffe1de Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 7 Jun 2014 14:45:01 -0500 Subject: [PATCH] [libpng16] Changed file permissions of contrib/tools/intgamma.sh from 0644 to 0755 (Cosmin). --- ANNOUNCE | 20 +++++++++++--------- CHANGES | 4 +++- contrib/tools/intgamma.sh | 0 libpng-manual.txt | 12 ++++++------ libpng.3 | 22 +++++++++++----------- png.c | 7 +++---- 6 files changed, 34 insertions(+), 31 deletions(-) mode change 100644 => 100755 contrib/tools/intgamma.sh diff --git a/ANNOUNCE b/ANNOUNCE index 5b90506fd..5ea1c12ab 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.12rc01 - June 6, 2014 +Libpng 1.6.12rc02 - June 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,26 +9,28 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.12rc01.tar.xz (LZMA-compressed, recommended) - 1.6.12rc01.tar.gz + 1.6.12rc02.tar.xz (LZMA-compressed, recommended) + 1.6.12rc02.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1612r01.7z (LZMA-compressed, recommended) - lp1612r01.zip + lp1612r02.7z (LZMA-compressed, recommended) + lp1612r02.zip Other information: - 1.6.12rc01-README.txt - 1.6.12rc01-LICENSE.txt - libpng-1.6.12rc01-*.asc (armored detached GPG signatures) + 1.6.12rc02-README.txt + 1.6.12rc02-LICENSE.txt + libpng-1.6.12rc02-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.11): -Version 1.6.12rc01 [June 6, 2014] +Version 1.6.12rc01 [June 7, 2014] Relocated new code from 1.6.11beta06 in png.c to a point after the declarations (Max Stepin). + Changed file permissions of contrib/tools/intgamma.sh, + test-driver, and compile from 0644 to 0755 (Cosmin). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 2bba0898c..16f5280ee 100644 --- a/CHANGES +++ b/CHANGES @@ -4925,9 +4925,11 @@ Version 1.6.11rc02 [June 3, 2014] Version 1.6.11 [June 5, 2014] No changes. -Version 1.6.12rc01 [June 6, 2014] +Version 1.6.12rc01 [June 7, 2014] Relocated new code from 1.6.11beta06 in png.c to a point after the declarations (Max Stepin). + Changed file permissions of contrib/tools/intgamma.sh, + test-driver, and compile from 0644 to 0755 (Cosmin). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/contrib/tools/intgamma.sh b/contrib/tools/intgamma.sh old mode 100644 new mode 100755 diff --git a/libpng-manual.txt b/libpng-manual.txt index 12c24ef2b..8c1e8e169 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.12rc01 - June 6, 2014 + libpng version 1.6.12rc02 - June 7, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -11,15 +11,15 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.12rc01 - June 6, 2014 + libpng versions 0.97, January 1998, through 1.6.12rc02 - June 7, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson - libpng 1.0 beta 6 version 0.96 May 28, 1997 + libpng 1.0 beta 6 - version 0.96 - May 28, 1997 Updated and distributed by Andreas Dilger Copyright (c) 1996, 1997 Andreas Dilger - libpng 1.0 beta 2 - version 0.88 January 26, 1996 + libpng 1.0 beta 2 - version 0.88 - January 26, 1996 For conditions of distribution and use, see copyright notice in png.h. Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. @@ -5275,13 +5275,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -June 6, 2014 +June 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.6.12rc01 are Y2K compliant. It is my belief that earlier +upward through 1.6.12rc02 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 a3c111d01..30ae808e2 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "June 6, 2014" +.TH LIBPNG 3 "June 7, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.12rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.12rc02 .SH SYNOPSIS \fB #include \fP @@ -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.12rc01 - June 6, 2014 + libpng version 1.6.12rc02 - June 7, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -515,15 +515,15 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.12rc01 - June 6, 2014 + libpng versions 0.97, January 1998, through 1.6.12rc02 - June 7, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson - libpng 1.0 beta 6 version 0.96 May 28, 1997 + libpng 1.0 beta 6 - version 0.96 - May 28, 1997 Updated and distributed by Andreas Dilger Copyright (c) 1996, 1997 Andreas Dilger - libpng 1.0 beta 2 - version 0.88 January 26, 1996 + libpng 1.0 beta 2 - version 0.88 - January 26, 1996 For conditions of distribution and use, see copyright notice in png.h. Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. @@ -5779,13 +5779,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -June 6, 2014 +June 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.6.12rc01 are Y2K compliant. It is my belief that earlier +upward through 1.6.12rc02 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 @@ -6079,7 +6079,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.12rc01 - June 6, 2014: +Libpng version 1.6.12rc02 - June 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). @@ -6102,7 +6102,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.12rc01, June 6, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.12rc02, June 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 @@ -6201,7 +6201,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 6, 2014 +June 7, 2014 .\" end of man page diff --git a/png.c b/png.c index e593a3e32..778ce6011 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_12rc01 Your_png_h_is_not_version_1_6_12rc01; +typedef png_libpng_version_1_6_12rc02 Your_png_h_is_not_version_1_6_12rc02; /* 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 @@ -773,13 +773,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.12rc01 - June 6, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.12rc02 - June 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.6.12rc01 - June 6, 2014\ + return "libpng version 1.6.12rc02 - June 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."; @@ -2217,7 +2217,6 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr, #if PNG_sRGB_PROFILE_CHECKS > 1 uLong crc = 0; /* the value for 0 length data */ #endif - unsigned int i; /* First see if PNG_SKIP_sRGB_CHECK_PROFILE has been set to "on" */