From d84af669dcc88217ad389111afbe2bbf0a679704 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 4 Dec 2009 08:44:58 -0600 Subject: [PATCH] [devel] Imported from libpng-1.4.0beta107.tar --- INSTALL | 2 +- LICENSE | 4 ++-- README | 2 +- libpng-1.4.0beta107.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.5 | 2 +- projects/cbuilder5/README.txt | 2 +- projects/visualc6/libpng.dsp | 32 ++++++++++++++++---------------- projects/visualc71/libpng.vcproj | 2 +- projects/xcode/README.txt | 2 +- 11 files changed, 35 insertions(+), 35 deletions(-) diff --git a/INSTALL b/INSTALL index 285cd5f71..781b6c705 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.0beta107 - November 27, 2009 +Installing libpng version 1.4.0beta107 - December 4, 2009 On Unix/Linux and similar systems, you can simply type diff --git a/LICENSE b/LICENSE index 46eb0abad..2aaba24f0 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.0beta107, November 27, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta107, December 4, 2009, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 27, 2009 +December 4, 2009 diff --git a/README b/README index e3e3868d6..0a60081a0 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.0beta107 - November 27, 2009 (shared library 14.0) +README for libpng version 1.4.0beta107 - December 4, 2009 (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.0beta107.txt b/libpng-1.4.0beta107.txt index 861e5e5c3..816aaa430 100644 --- a/libpng-1.4.0beta107.txt +++ b/libpng-1.4.0beta107.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.0beta107 - November 27, 2009 + libpng version 1.4.0beta107 - December 4, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 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.0beta107 - November 27, 2009 + libpng versions 0.97, January 1998, through 1.4.0beta107 - December 4, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -3213,7 +3213,7 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -November 27, 2009 +December 4, 2009 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 cc9975005..5a70bc45c 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "November 27, 2009" +.TH LIBPNG 3 "December 4, 2009" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta107 .SH SYNOPSIS @@ -777,7 +777,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.0beta107 - November 27, 2009 + libpng version 1.4.0beta107 - December 4, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -788,7 +788,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.0beta107 - November 27, 2009 + libpng versions 0.97, January 1998, through 1.4.0beta107 - December 4, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -3990,7 +3990,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -November 27, 2009 +December 4, 2009 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -4222,7 +4222,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.0beta107 - November 27, 2009: +Libpng version 1.4.0beta107 - December 4, 2009: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4245,7 +4245,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.0beta107, November 27, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta107, December 4, 2009, 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 @@ -4344,7 +4344,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 27, 2009 +December 4, 2009 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index e4e5cfb93..5cfe24347 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "November 27, 2009" +.TH LIBPNGPF 3 "December 4, 2009" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta107 (private functions) diff --git a/png.5 b/png.5 index 2dd9b41de..cde9d5801 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "November 27, 2009" +.TH PNG 5 "December 4, 2009" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/projects/cbuilder5/README.txt b/projects/cbuilder5/README.txt index 4bb57e6ee..9efaa4b6c 100644 --- a/projects/cbuilder5/README.txt +++ b/projects/cbuilder5/README.txt @@ -4,7 +4,7 @@ It needs to depend on pngpriv.h It needs to *not* depend on pnggccrd.c or pngvcrd.c -It needs to DEFINE PNG_CONFIGURE_LIBPNG while building +It needs to DEFINE PNG_NO_PEDANTIC_WARNING while building the library, but not while building an application. If an updated version is not received, this project will diff --git a/projects/visualc6/libpng.dsp b/projects/visualc6/libpng.dsp index 5c7c0b7ab..6704255ab 100644 --- a/projects/visualc6/libpng.dsp +++ b/projects/visualc6/libpng.dsp @@ -8,22 +8,22 @@ CFG=libpng - Win32 DLL Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "libpng.mak". -!MESSAGE +!MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "libpng.mak" CFG="libpng - Win32 DLL Release" -!MESSAGE +!MESSAGE !MESSAGE Possible choices for configuration are: -!MESSAGE +!MESSAGE !MESSAGE "libpng - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "libpng - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "libpng - Win32 DLL VB" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "libpng - Win32 LIB Release" (based on "Win32 (x86) Static Library") !MESSAGE "libpng - Win32 LIB Debug" (based on "Win32 (x86) Static Library") -!MESSAGE +!MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 @@ -52,8 +52,8 @@ MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" -# ADD RSC /l 0x409 /i "..\.." /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" +# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG" +# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -83,8 +83,8 @@ MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "_DEBUG" -# ADD RSC /l 0x409 /i "..\.." /d "PNG_CONFIGURE_LIBPNG" /d "_DEBUG" /d PNG_DEBUG=1 +# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG" +# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG" /d PNG_DEBUG=1 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -114,8 +114,8 @@ MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" -# ADD RSC /l 0x409 /i "..\.." /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" /dPNG_LIBPNG_DLLFNAME_POSTFIX=""""VB"""" /dPNG_LIBPNG_SPECIALBUILD=""""__stdcall calling convention used for exported functions"""" +# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG" +# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG" /dPNG_LIBPNG_DLLFNAME_POSTFIX=""""VB"""" /dPNG_LIBPNG_SPECIALBUILD=""""__stdcall calling convention used for exported functions"""" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -147,8 +147,8 @@ CPP=cl.exe # ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /FD /c # SUBTRACT CPP /YX /Yc /Yu RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" -# ADD RSC /l 0x409 /i "..\.." /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" +# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG" +# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -174,8 +174,8 @@ CPP=cl.exe # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D PNG_DEBUG=1 /FD /GZ /c # SUBTRACT CPP /YX /Yc /Yu RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "_DEBUG" -# ADD RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "_DEBUG" +# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG" +# ADD RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/projects/visualc71/libpng.vcproj b/projects/visualc71/libpng.vcproj index 750781a77..ce03e6832 100644 --- a/projects/visualc71/libpng.vcproj +++ b/projects/visualc71/libpng.vcproj @@ -138,7 +138,7 @@ Name="VCPreLinkEventTool"/> diff --git a/projects/xcode/README.txt b/projects/xcode/README.txt index de852e40d..440149d67 100644 --- a/projects/xcode/README.txt +++ b/projects/xcode/README.txt @@ -2,7 +2,7 @@ The xcode project has not been entirely updated to libpng-1.4.0. It needs to *not* depend on pnggccrd.c or pngvcrd.c -It needs to PNG_CONFIGURE_LIBPNG in the CFLAGS while building +It needs to PNG_NO_PEDANTIC_WARNINGS in the CFLAGS while building the library, but not while building an application. If an updated version is not received, this project will