diff --git a/ANNOUNCE b/ANNOUNCE index 74571fbbe..c66f2d35e 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.4beta05 - August 4, 2010 +Libpng 1.4.4beta05 - August 6, 2010 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,7 +49,7 @@ version 1.4.4beta03 [July 24, 2010] version 1.4.4beta04 [July 31, 2010] Updated the read macros and functions from 1.5.0beta38. -version 1.4.4beta05 [August 4, 2010] +version 1.4.4beta05 [August 6, 2010] Updated projects/visualc71 so it can find scripts/pnglibconf.h Removed unused png_mem_* defines from pngconf.h. Correct use of _WINDOWS_ in pngconf.h diff --git a/CHANGES b/CHANGES index aa6e46166..3705bc142 100644 --- a/CHANGES +++ b/CHANGES @@ -2633,7 +2633,7 @@ version 1.4.4beta03 [July 24, 2010] version 1.4.4beta04 [July 31, 2010] Updated the read macros and functions from 1.5.0beta38. -version 1.4.4beta05 [August 4, 2010] +version 1.4.4beta05 [August 6, 2010] Updated projects/visualc71 so it can find scripts/pnglibconf.h Removed unused png_mem_* defines from pngconf.h. Correct use of _WINDOWS_ in pngconf.h diff --git a/INSTALL b/INSTALL index 953f670d6..7a3f8cd02 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.4beta05 - August 3, 2010 +Installing libpng version 1.4.4beta05 - August 6, 2010 On Unix/Linux and similar systems, you can simply type diff --git a/LICENSE b/LICENSE index 135b0eb94..87094437c 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.4.4beta05, August 3, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.4.4beta05, August 6, 2010, are Copyright (c) 2004, 2006-2010 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 -August 3, 2010 +August 6, 2010 diff --git a/README b/README index e1f0587a2..86cbb2b8d 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.4beta05 - August 3, 2010 (shared library 14.0) +README for libpng version 1.4.4beta05 - August 6, 2010 (shared library 14.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-1.4.4beta05.txt b/libpng-1.4.4beta05.txt index 468aa2f2c..4ce79a8d0 100644 --- a/libpng-1.4.4beta05.txt +++ b/libpng-1.4.4beta05.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.4beta05 - August 3, 2010 + libpng version 1.4.4beta05 - August 6, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.4beta05 - August 3, 2010 + libpng versions 0.97, January 1998, through 1.4.4beta05 - August 6, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -3297,7 +3297,7 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -August 3, 2010 +August 6, 2010 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 ea08c3416..3e1610c97 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "August 3, 2010" +.TH LIBPNG 3 "August 6, 2010" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.4beta05 .SH SYNOPSIS @@ -785,7 +785,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.4.4beta05 - August 3, 2010 + libpng version 1.4.4beta05 - August 6, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -796,7 +796,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.4beta05 - August 3, 2010 + libpng versions 0.97, January 1998, through 1.4.4beta05 - August 6, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -4082,7 +4082,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -August 3, 2010 +August 6, 2010 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -4328,7 +4328,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.4beta05 - August 3, 2010: +Libpng version 1.4.4beta05 - August 6, 2010: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4351,7 +4351,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.4beta05, August 3, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.4.4beta05, August 6, 2010, 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 @@ -4450,7 +4450,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 3, 2010 +August 6, 2010 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index aaf1c1c7e..27604d036 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "August 3, 2010" +.TH LIBPNGPF 3 "August 6, 2010" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.4beta05 (private functions) diff --git a/png.5 b/png.5 index c37a91a5d..b59f0cc45 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "August 3, 2010" +.TH PNG 5 "August 6, 2010" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 5dab71974..e8950856b 100644 --- a/png.c +++ b/png.c @@ -551,13 +551,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.4.4beta05 - August 3, 2010" PNG_STRING_NEWLINE \ + "libpng version 1.4.4beta05 - August 6, 2010" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2010 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 ((png_charp) "libpng version 1.4.4beta05 - August 3, 2010\ + return ((png_charp) "libpng version 1.4.4beta05 - August 6, 2010\ Copyright (c) 1998-2010 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 8c416c491..952f24d6a 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.4beta05 - August 3, 2010 + * libpng version 1.4.4beta05 - August 6, 2010 * Copyright (c) 1998-2010 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.4.4beta05 - August 3, 2010: Glenn + * libpng versions 0.97, January 1998, through 1.4.4beta05 - August 6, 2010: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -177,7 +177,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.4beta05, August 3, 2010, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.4beta05, August 6, 2010, are * Copyright (c) 2004, 2006-2010 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: @@ -289,7 +289,7 @@ * Y2K compliance in libpng: * ========================= * - * August 3, 2010 + * August 6, 2010 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -353,7 +353,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.4.4beta05" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.4beta05 - August 3, 2010\n" + " libpng version 1.4.4beta05 - August 6, 2010\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 diff --git a/pngpriv.h b/pngpriv.h index 22b96df4c..2ad636bf4 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.4beta05 - August 4, 2010 + * libpng version 1.4.4beta05 - August 6, 2010 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/projects/visualc71/libpng.vcproj b/projects/visualc71/libpng.vcproj index ce03e6832..e08346b76 100644 --- a/projects/visualc71/libpng.vcproj +++ b/projects/visualc71/libpng.vcproj @@ -17,7 +17,7 @@ + AdditionalIncludeDirectories="..\..;..\..\scripts;..\..\..\zlib;$(IntDir)"/> + AdditionalIncludeDirectories="..\..;..\..\scripts;..\..\..\zlib;$(IntDir)"/> + AdditionalIncludeDirectories="..\..;..\..\scripts;..\..\..\zlib;$(IntDir)"/> @@ -210,10 +210,10 @@ $(TargetPath) ..\..\pngtest.png $(IntDir)\pngout.png" diff --git a/projects/visualc71/zlib.vcproj b/projects/visualc71/zlib.vcproj index 23e0ac56f..614b869e7 100644 --- a/projects/visualc71/zlib.vcproj +++ b/projects/visualc71/zlib.vcproj @@ -17,7 +17,7 @@ Name="VCCLCompilerTool" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\zlib" - PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -62,7 +62,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\zlib" - PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" @@ -107,9 +107,9 @@ Name="VCCLCompilerTool" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\zlib" - PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS" StringPooling="TRUE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" WarningLevel="3" CompileAs="1"/> @@ -146,9 +146,9 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\zlib" - PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" WarningLevel="3" DebugInformationFormat="4" CompileAs="1"/> @@ -196,7 +196,16 @@ RelativePath="..\..\..\zlib\deflate.c"> + RelativePath="..\..\..\zlib\gzlib.c"> + + + + + + diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index acbd4bd4c..54af4bdec 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.4beta05 - August 3, 2010 +libpng version 1.4.4beta05 - August 6, 2010 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index a289efe8f..349cb94c0 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@