diff --git a/ANNOUNCE b/ANNOUNCE
index 64fa1910d..eb43331ff 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.5.0beta20 - April 24, 2010
+Libpng 1.5.0beta21 - April 25, 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.
@@ -9,20 +9,20 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- 1.5.0beta20.tar.xz (LZMA-compressed, recommended)
- 1.5.0beta20.tar.gz
- 1.5.0beta20.tar.bz2
+ 1.5.0beta21.tar.xz (LZMA-compressed, recommended)
+ 1.5.0beta21.tar.gz
+ 1.5.0beta21.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp150b20.zip
- lp150b20.7z
+ lp150b21.zip
+ lp150b21.7z
Other information:
- 1.5.0beta20-README.txt
- 1.5.0beta20-LICENSE.txt
+ 1.5.0beta21-README.txt
+ 1.5.0beta21-LICENSE.txt
Changes since the last public release (1.4.1):
@@ -189,6 +189,9 @@ version 1.5.0beta19 [April 24, 2010]
version 1.5.0beta20 [April 24, 2010]
Relaxed more overly-restrictive permissions of some files.
+version 1.5.0beta21 [April 25, 2010]
+ Trivial editing; changed CRLF to NEWLINE in the new vstudio project files.
+
Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/CHANGES b/CHANGES
index 137b2c777..0387c14c5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2671,6 +2671,9 @@ version 1.5.0beta19 [April 24, 2010]
version 1.5.0beta20 [April 24, 2010]
Relaxed more overly-restrictive permissions of some files.
+version 1.5.0beta21 [April 25, 2010]
+ Trivial editing; changed CRLF to NEWLINE in the new vstudio project files.
+
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/libpng.pc.in b/libpng.pc.in
index 3e7e2c58a..6d7bb210d 100644
--- a/libpng.pc.in
+++ b/libpng.pc.in
@@ -1,11 +1,10 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-includedir=@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
+includedir=@includedir@/libpng15
Name: libpng
Description: Loads and saves PNG files
-Version: @PNGLIB_VERSION@
-Libs: -L${libdir} -lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
-Libs.private: @LIBS@
+Version: 1.5.0beta20
+Libs: -L${libdir} -lpng15
Cflags: -I${includedir}
diff --git a/projects/vstudio/libpng/libpng.vcxproj b/projects/vstudio/libpng/libpng.vcxproj
index 3a775d2c0..e70d68b80 100644
--- a/projects/vstudio/libpng/libpng.vcxproj
+++ b/projects/vstudio/libpng/libpng.vcxproj
@@ -1,233 +1,233 @@
-‹½¨
-
-
-
- Debug Library
- Win32
-
-
- Debug
- Win32
-
-
- Release Library
- Win32
-
-
- Release
- Win32
-
-
-
- {D6973076-9317-4EF2-A0B8-B7A18AC0713E}
- Win32Proj
- libpng
-
-
-
-
- DynamicLibrary
- MultiByte
- true
-
-
- StaticLibrary
- MultiByte
-
-
- DynamicLibrary
- true
- MultiByte
-
-
- StaticLibrary
- MultiByte
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
-
-
- $(ProjectName)15
-
-
- false
-
- $(ProjectName)15
-
-
- false
-
-
- $(ProjectName)15
-
-
- false
-
- $(ProjectName)15
-
-
-
- Use
- Level4
- false
- ProgramDatabase
- EnableFastChecks
- MultiThreadedDebugDLL
- WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
- true
- false
- false
- pngpriv.h
- true
- CompileAsC
- true
- 4996;4127
- $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)
- true
- Disabled
-
-
- Windows
- true
- zlib.lib;msvcrtd.lib;kernel32.lib
- true
- 15
- $(OutDir)
-
-
-
-
- Use
- Level4
- false
- ProgramDatabase
- Disabled
- EnableFastChecks
- MultiThreadedDebugDLL
- WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
- true
- false
- false
- pngpriv.h
- true
- CompileAsC
- true
- 4996;4127
- $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)
- true
-
-
- Windows
- true
-
-
-
-
- Level4
- Use
- ProgramDatabase
- MultiThreadedDLL
- true
- true
- WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- false
- false
- pngpriv.h
- true
- CompileAsC
- true
- false
- 4996;4127
- $(ZLib1Dir);..\..\..\scripts;%(AdditionalIncludeDirectories)
- true
- Full
-
-
- Windows
- true
- true
- true
- zdll.lib;msvcrt.lib;kernel32.lib
- true
- 15
- $(ZLib1Dir)
-
-
-
-
- Level4
- Use
- ProgramDatabase
- MultiThreadedDLL
- true
- true
- WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- false
- false
- pngpriv.h
- true
- CompileAsC
- true
- false
- 4996;4127
- $(ZLib1Dir);..\..\..\scripts;%(AdditionalIncludeDirectories)
- true
- Full
-
-
- Windows
- true
- true
- true
-
-
-
-
- Create
- Create
- Create
- Create
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
- true
-
-
-
-
-
-
\ No newline at end of file
+‹½¨
+
+
+
+ Debug Library
+ Win32
+
+
+ Debug
+ Win32
+
+
+ Release Library
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E}
+ Win32Proj
+ libpng
+
+
+
+
+ DynamicLibrary
+ MultiByte
+ true
+
+
+ StaticLibrary
+ MultiByte
+
+
+ DynamicLibrary
+ true
+ MultiByte
+
+
+ StaticLibrary
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+ $(ProjectName)15
+
+
+ false
+
+ $(ProjectName)15
+
+
+ false
+
+
+ $(ProjectName)15
+
+
+ false
+
+ $(ProjectName)15
+
+
+
+ Use
+ Level4
+ false
+ ProgramDatabase
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
+ true
+ true
+ false
+ false
+ pngpriv.h
+ true
+ CompileAsC
+ true
+ 4996;4127
+ $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)
+ true
+ Disabled
+
+
+ Windows
+ true
+ zlib.lib;msvcrtd.lib;kernel32.lib
+ true
+ 15
+ $(OutDir)
+
+
+
+
+ Use
+ Level4
+ false
+ ProgramDatabase
+ Disabled
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
+ true
+ true
+ false
+ false
+ pngpriv.h
+ true
+ CompileAsC
+ true
+ 4996;4127
+ $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)
+ true
+
+
+ Windows
+ true
+
+
+
+
+ Level4
+ Use
+ ProgramDatabase
+ MultiThreadedDLL
+ true
+ true
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
+ false
+ false
+ pngpriv.h
+ true
+ CompileAsC
+ true
+ false
+ 4996;4127
+ $(ZLib1Dir);..\..\..\scripts;%(AdditionalIncludeDirectories)
+ true
+ Full
+
+
+ Windows
+ true
+ true
+ true
+ zdll.lib;msvcrt.lib;kernel32.lib
+ true
+ 15
+ $(ZLib1Dir)
+
+
+
+
+ Level4
+ Use
+ ProgramDatabase
+ MultiThreadedDLL
+ true
+ true
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
+ false
+ false
+ pngpriv.h
+ true
+ CompileAsC
+ true
+ false
+ 4996;4127
+ $(ZLib1Dir);..\..\..\scripts;%(AdditionalIncludeDirectories)
+ true
+ Full
+
+
+ Windows
+ true
+ true
+ true
+
+
+
+
+ Create
+ Create
+ Create
+ Create
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
diff --git a/projects/vstudio/pngtest/pngtest.vcxproj b/projects/vstudio/pngtest/pngtest.vcxproj
index 937eea9a6..3e1ddd718 100644
--- a/projects/vstudio/pngtest/pngtest.vcxproj
+++ b/projects/vstudio/pngtest/pngtest.vcxproj
@@ -1,217 +1,217 @@
-‹½¨
-
-
-
- Debug Library
- Win32
-
-
- Debug
- Win32
-
-
- Release Library
- Win32
-
-
- Release
- Win32
-
-
-
- {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}
- Win32Proj
- pngtest
-
-
-
-
- Application
- Unicode
-
-
- Application
- Unicode
-
-
- Application
- Unicode
-
-
- Application
- Unicode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
-
-
-
- false
-
-
-
- false
-
-
-
- false
-
-
-
-
- NotUsing
- Level4
- false
- ProgramDatabase
- Disabled
- EnableFastChecks
- MultiThreadedDebugDLL
- WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)
- 4996
- false
- true
- true
- true
- false
- true
-
-
- Console
- true
- libpng15.lib;zlib.lib;msvcrtd.lib;kernel32.lib
- true
- $(OutDir)
-
-
- Executing PNG test program
- "$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png"
- $(IntDir)pngout.png
- ..\..\..\pngtest.png;$(OutDir)pngtest.exe
-
-
-
-
- NotUsing
- Level4
- false
- ProgramDatabase
- Disabled
- EnableFastChecks
- MultiThreadedDebugDLL
- WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)
- 4996
- false
- true
- true
- true
- false
- true
-
-
- Console
- true
- libpng15.lib;zlib.lib;msvcrtd.lib;kernel32.lib
- true
- $(OutDir)
-
-
- Executing PNG test program
- "$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png"
- $(IntDir)pngout.png
- ..\..\..\pngtest.png;$(OutDir)pngtest.exe
-
-
-
-
- Level4
- NotUsing
- ProgramDatabase
- Full
- MultiThreadedDLL
- false
- true
- WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(ZLib1Dir);..\..\..\scripts;%(AdditionalIncludeDirectories)
- 4996
- false
- true
- true
- false
- true
-
-
- Console
- true
- true
- true
- libpng15.lib;msvcrt.lib;kernel32.lib
- true
- $(OutDir)
-
-
- Executing PNG test program
- "$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png"
- $(IntDir)pngout.png
- ..\..\..\pngtest.png;$(OutDir)pngtest.exe
-
-
-
-
- Level4
- NotUsing
- ProgramDatabase
- Full
- MultiThreadedDLL
- false
- true
- WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(ZLib1Dir);..\..\..\scripts;%(AdditionalIncludeDirectories)
- 4996
- false
- true
- true
- false
- true
-
-
- Console
- true
- true
- true
- libpng15.lib;zlib.lib;msvcrt.lib;kernel32.lib
- true
- $(OutDir);$(ZLib1Dir)
-
-
- Executing PNG test program
- $(OutDir)pngtest.exe ..\..\..\pngtest.png $(IntDir)pngout.png
- "$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png"
- $(IntDir)pngout.png
- ..\..\..\pngtest.png;$(OutDir)pngtest.exe
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+‹½¨
+
+
+
+ Debug Library
+ Win32
+
+
+ Debug
+ Win32
+
+
+ Release Library
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}
+ Win32Proj
+ pngtest
+
+
+
+
+ Application
+ Unicode
+
+
+ Application
+ Unicode
+
+
+ Application
+ Unicode
+
+
+ Application
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+ false
+
+
+
+ false
+
+
+
+ false
+
+
+
+
+ NotUsing
+ Level4
+ false
+ ProgramDatabase
+ Disabled
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)
+ 4996
+ false
+ true
+ true
+ true
+ false
+ true
+
+
+ Console
+ true
+ libpng15.lib;zlib.lib;msvcrtd.lib;kernel32.lib
+ true
+ $(OutDir)
+
+
+ Executing PNG test program
+ "$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png"
+ $(IntDir)pngout.png
+ ..\..\..\pngtest.png;$(OutDir)pngtest.exe
+
+
+
+
+ NotUsing
+ Level4
+ false
+ ProgramDatabase
+ Disabled
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)
+ 4996
+ false
+ true
+ true
+ true
+ false
+ true
+
+
+ Console
+ true
+ libpng15.lib;zlib.lib;msvcrtd.lib;kernel32.lib
+ true
+ $(OutDir)
+
+
+ Executing PNG test program
+ "$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png"
+ $(IntDir)pngout.png
+ ..\..\..\pngtest.png;$(OutDir)pngtest.exe
+
+
+
+
+ Level4
+ NotUsing
+ ProgramDatabase
+ Full
+ MultiThreadedDLL
+ false
+ true
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ $(ZLib1Dir);..\..\..\scripts;%(AdditionalIncludeDirectories)
+ 4996
+ false
+ true
+ true
+ false
+ true
+
+
+ Console
+ true
+ true
+ true
+ libpng15.lib;msvcrt.lib;kernel32.lib
+ true
+ $(OutDir)
+
+
+ Executing PNG test program
+ "$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png"
+ $(IntDir)pngout.png
+ ..\..\..\pngtest.png;$(OutDir)pngtest.exe
+
+
+
+
+ Level4
+ NotUsing
+ ProgramDatabase
+ Full
+ MultiThreadedDLL
+ false
+ true
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ $(ZLib1Dir);..\..\..\scripts;%(AdditionalIncludeDirectories)
+ 4996
+ false
+ true
+ true
+ false
+ true
+
+
+ Console
+ true
+ true
+ true
+ libpng15.lib;zlib.lib;msvcrt.lib;kernel32.lib
+ true
+ $(OutDir);$(ZLib1Dir)
+
+
+ Executing PNG test program
+ $(OutDir)pngtest.exe ..\..\..\pngtest.png $(IntDir)pngout.png
+ "$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png"
+ $(IntDir)pngout.png
+ ..\..\..\pngtest.png;$(OutDir)pngtest.exe
+
+
+
+
+
+
+
+
+
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index 946b3eabe..32b5df150 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,87 +1,87 @@
-
-VisualStudio instructions
-
-libpng version 1.5.0beta19 - April 20, 2010
-
-Copyright (c) 1998-2010 Glenn Randers-Pehrson
-
-This code is released under the libpng license.
-For conditions of distribution and use, see the disclaimer
-and license in png.h
-
-This diretory contains support for building libpng under MicroSoft
-VisualStudio 2010. It may also work under later versions of VisualStudio.
-You should be familiar with VisualStudio before using this directory.
-
-Initial preparations
-====================
-You should install the 'official' build of zlib on your system - follow the
-instructions provided on http://www.zlib.net. When a new release is being
-made of zlib the instructions disappear for a while until the new official
-build is available. You will have to wait.
-
-You must enter some information in zlib.props before attempting to build
-with this 'solution'. Please read and edit zlib.props first. You will
-probably not be familiar with the contents of zlib.props - do not worry,
-it is mostly harmless.
-
-Make sure that your official build layout matches the requirements listed
-in zlib.props. Prior to zlib-1.2.4 the official build (1.2.3) placed
-include and library files in different directories - if you find this
-has happened just put them all in the same directory.
-
-This is all you need to do to build the 'release' and 'release library'
-configurations.
-
-Debugging
-=========
-The release configurations default to /Ox optimization. Full debugging
-information is produced (in the .pdb), but if you encounter a problem the
-optimization may make it difficult to debug. Simply rebuild with a lower
-optimization level (e.g. /Od.)
-
-Stop reading here
-=================
-You have enough information to build a working application.
-
-Debug versions have limited support
-===================================
-This solution includes limited support for debug versions of libpng. You
-do not need these unless your own solution itself uses debug builds (it is
-far more effective to debug on the release builds, there is no point building
-a special debug build.)
-
-If, despite the previous paragraph, you still feel you need a debug build you
-will have to download the zlib source as well (http://www.zlib.net) and include
-the directory where you unpack it in zlib.props. This solution will then be
-able to build a minimal zlib sufficient for libpng. This build is only
-suitable for making a debug libpng.
-
-The debug build of libpng is minimally supported. Support for debug builds of
-zlib is also minimal. You really don't want to do this.
-
-This solution only supports the Multi-Threaded DLL C Runtime
-============================================================
-If you examine the solution you will find that it very deliberately lists
-exactly which MicroSoft DLLs it is linking against. It explicitly links
-against msvcrt.lib. The debug version links against msvcrtd.lib (this is
-why it is a debug version - it's nothing to do with having any special
-debug support, it doesn't).
-
-These versions of the MicroSoft C runtime correspond to the compiler flags
-/MD (release) and /MDd (debug) - the "Multi-Threaded DLL" implementation of the
-C runtime library.
-
-If you need to change this then you will have to make sure that both the
-compiler flags and the ".lib" in the linker dependences match up. Fortunately
-neither zlib nor libpng require libraries other than a C runtime and
-kernel32.
-
-You cannot pass (FILE*) objects from a different runtime (including msvcrtd
-to msvcrt) to libpng. If you do then your program will crash within libpng
-when it first makes a file read or write call.
-
-It is likely if you have read this far that you have found you can't avoid
-having multiple C runtimes in your program. This is OK, it does work, but
-you will have to implement the libpng file read/write callbacks rather than
-using the internal libpng default. This is easy.
+
+VisualStudio instructions
+
+libpng version 1.5.0beta21 - April 25, 2010
+
+Copyright (c) 1998-2010 Glenn Randers-Pehrson
+
+This code is released under the libpng license.
+For conditions of distribution and use, see the disclaimer
+and license in png.h
+
+This directory contains support for building libpng under MicroSoft
+VisualStudio 2010. It may also work under later versions of VisualStudio.
+You should be familiar with VisualStudio before using this directory.
+
+Initial preparations
+====================
+You should install the 'official' build of zlib on your system - follow the
+instructions provided on http://www.zlib.net. When a new release is being
+made of zlib the instructions disappear for a while until the new official
+build is available. You will have to wait.
+
+You must enter some information in zlib.props before attempting to build
+with this 'solution'. Please read and edit zlib.props first. You will
+probably not be familiar with the contents of zlib.props - do not worry,
+it is mostly harmless.
+
+Make sure that your official build layout matches the requirements listed
+in zlib.props. Prior to zlib-1.2.4 the official build (1.2.3) placed
+include and library files in different directories - if you find this
+has happened just put them all in the same directory.
+
+This is all you need to do to build the 'release' and 'release library'
+configurations.
+
+Debugging
+=========
+The release configurations default to /Ox optimization. Full debugging
+information is produced (in the .pdb), but if you encounter a problem the
+optimization may make it difficult to debug. Simply rebuild with a lower
+optimization level (e.g. /Od.)
+
+Stop reading here
+=================
+You have enough information to build a working application.
+
+Debug versions have limited support
+===================================
+This solution includes limited support for debug versions of libpng. You
+do not need these unless your own solution itself uses debug builds (it is
+far more effective to debug on the release builds, there is no point building
+a special debug build.)
+
+If, despite the previous paragraph, you still feel you need a debug build you
+will have to download the zlib source as well (http://www.zlib.net) and include
+the directory where you unpack it in zlib.props. This solution will then be
+able to build a minimal zlib sufficient for libpng. This build is only
+suitable for making a debug libpng.
+
+The debug build of libpng is minimally supported. Support for debug builds of
+zlib is also minimal. You really don't want to do this.
+
+This solution only supports the Multi-Threaded DLL C Runtime
+============================================================
+If you examine the solution you will find that it very deliberately lists
+exactly which MicroSoft DLLs it is linking against. It explicitly links
+against msvcrt.lib. The debug version links against msvcrtd.lib (this is
+why it is a debug version - it's nothing to do with having any special
+debug support, it doesn't).
+
+These versions of the MicroSoft C runtime correspond to the compiler flags
+/MD (release) and /MDd (debug) - the "Multi-Threaded DLL" implementation of the
+C runtime library.
+
+If you need to change this then you will have to make sure that both the
+compiler flags and the ".lib" in the linker dependences match up. Fortunately
+neither zlib nor libpng require libraries other than a C runtime and
+kernel32.
+
+You cannot pass (FILE*) objects from a different runtime (including msvcrtd
+to msvcrt) to libpng. If you do then your program will crash within libpng
+when it first makes a file read or write call.
+
+It is likely if you have read this far that you have found you can't avoid
+having multiple C runtimes in your program. This is OK, it does work, but
+you will have to implement the libpng file read/write callbacks rather than
+using the internal libpng default. This is easy.
diff --git a/projects/vstudio/vstudio.sln b/projects/vstudio/vstudio.sln
index e1f446501..2ce71bc1b 100644
--- a/projects/vstudio/vstudio.sln
+++ b/projects/vstudio/vstudio.sln
@@ -1,50 +1,50 @@
-‹½¨
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng\libpng.vcxproj", "{D6973076-9317-4EF2-A0B8-B7A18AC0713E}"
- ProjectSection(ProjectDependencies) = postProject
- {E5A897B8-320E-6490-784B-11B374DD242A} = {E5A897B8-320E-6490-784B-11B374DD242A}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pngtest", "pngtest\pngtest.vcxproj", "{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}"
- ProjectSection(ProjectDependencies) = postProject
- {D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {D6973076-9317-4EF2-A0B8-B7A18AC0713E}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib\zlib.vcxproj", "{E5A897B8-320E-6490-784B-11B374DD242A}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug Library|Win32 = Debug Library|Win32
- Debug|Win32 = Debug|Win32
- Release Library|Win32 = Release Library|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
- {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|Win32.Build.0 = Debug Library|Win32
- {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Win32.ActiveCfg = Debug|Win32
- {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Win32.Build.0 = Debug|Win32
- {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|Win32.ActiveCfg = Release Library|Win32
- {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|Win32.Build.0 = Release Library|Win32
- {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Win32.ActiveCfg = Release|Win32
- {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Win32.Build.0 = Release|Win32
- {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
- {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug Library|Win32.Build.0 = Debug Library|Win32
- {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug|Win32.ActiveCfg = Debug|Win32
- {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug|Win32.Build.0 = Debug|Win32
- {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release Library|Win32.ActiveCfg = Release Library|Win32
- {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release Library|Win32.Build.0 = Release Library|Win32
- {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release|Win32.ActiveCfg = Release|Win32
- {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release|Win32.Build.0 = Release|Win32
- {E5A897B8-320E-6490-784B-11B374DD242A}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
- {E5A897B8-320E-6490-784B-11B374DD242A}.Debug Library|Win32.Build.0 = Debug Library|Win32
- {E5A897B8-320E-6490-784B-11B374DD242A}.Debug|Win32.ActiveCfg = Debug|Win32
- {E5A897B8-320E-6490-784B-11B374DD242A}.Debug|Win32.Build.0 = Debug|Win32
- {E5A897B8-320E-6490-784B-11B374DD242A}.Release Library|Win32.ActiveCfg = Debug|Win32
- {E5A897B8-320E-6490-784B-11B374DD242A}.Release|Win32.ActiveCfg = Debug|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
+‹½¨
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C++ Express 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng\libpng.vcxproj", "{D6973076-9317-4EF2-A0B8-B7A18AC0713E}"
+ ProjectSection(ProjectDependencies) = postProject
+ {E5A897B8-320E-6490-784B-11B374DD242A} = {E5A897B8-320E-6490-784B-11B374DD242A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pngtest", "pngtest\pngtest.vcxproj", "{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}"
+ ProjectSection(ProjectDependencies) = postProject
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {D6973076-9317-4EF2-A0B8-B7A18AC0713E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib\zlib.vcxproj", "{E5A897B8-320E-6490-784B-11B374DD242A}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug Library|Win32 = Debug Library|Win32
+ Debug|Win32 = Debug|Win32
+ Release Library|Win32 = Release Library|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|Win32.Build.0 = Debug Library|Win32
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Win32.Build.0 = Debug|Win32
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|Win32.ActiveCfg = Release Library|Win32
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|Win32.Build.0 = Release Library|Win32
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Win32.ActiveCfg = Release|Win32
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Win32.Build.0 = Release|Win32
+ {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
+ {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug Library|Win32.Build.0 = Debug Library|Win32
+ {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug|Win32.Build.0 = Debug|Win32
+ {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release Library|Win32.ActiveCfg = Release Library|Win32
+ {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release Library|Win32.Build.0 = Release Library|Win32
+ {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release|Win32.ActiveCfg = Release|Win32
+ {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release|Win32.Build.0 = Release|Win32
+ {E5A897B8-320E-6490-784B-11B374DD242A}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
+ {E5A897B8-320E-6490-784B-11B374DD242A}.Debug Library|Win32.Build.0 = Debug Library|Win32
+ {E5A897B8-320E-6490-784B-11B374DD242A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E5A897B8-320E-6490-784B-11B374DD242A}.Debug|Win32.Build.0 = Debug|Win32
+ {E5A897B8-320E-6490-784B-11B374DD242A}.Release Library|Win32.ActiveCfg = Debug|Win32
+ {E5A897B8-320E-6490-784B-11B374DD242A}.Release|Win32.ActiveCfg = Debug|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 46c424991..4152ea2a7 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -1,43 +1,43 @@
‹½¨
-
-
-
-
-
- ..\..\..\..\zlib124-dll\zlib-1.2.4
-
-
- ..\..\..\..\zlib-1.2.4
-
-
+
+
+
+
+
+ ..\..\..\..\zlib124-dll\zlib-1.2.4
+
+
+ ..\..\..\..\zlib-1.2.4
+
+
diff --git a/projects/vstudio/zlib/zlib.vcxproj b/projects/vstudio/zlib/zlib.vcxproj
index 4258ba958..613b9e6a0 100644
--- a/projects/vstudio/zlib/zlib.vcxproj
+++ b/projects/vstudio/zlib/zlib.vcxproj
@@ -1,112 +1,112 @@
-‹½¨
-
-
-
- Debug Library
- Win32
-
-
- Debug
- Win32
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Win32Proj
-
-
-
-
- DynamicLibrary
- true
-
-
- StaticLibrary
-
-
- DynamicLibrary
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
-
-
- true
-
-
- true
-
-
-
- WIN32;ZLIB_DLL;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
- Level3
- ProgramDatabase
- Disabled
- true
-
-
- true
- Windows
- 1
- msvcrtd.lib;kernel32.lib
- true
-
-
-
-
- WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
- Level3
- ProgramDatabase
- Disabled
-
-
- MachineX86
- true
- Windows
-
-
-
-
- WIN32;NDEBUG;_WINDOWS;_USRDLL;DEBUGZLIB_EXPORTS;%(PreprocessorDefinitions)
- MultiThreadedDLL
- Level3
- ProgramDatabase
-
-
- MachineX86
- true
- Windows
- true
- true
-
-
-
-
-
-
\ No newline at end of file
+‹½¨
+
+
+
+ Debug Library
+ Win32
+
+
+ Debug
+ Win32
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Win32Proj
+
+
+
+
+ DynamicLibrary
+ true
+
+
+ StaticLibrary
+
+
+ DynamicLibrary
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+ true
+
+
+ true
+
+
+
+ WIN32;ZLIB_DLL;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+ Level3
+ ProgramDatabase
+ Disabled
+ true
+
+
+ true
+ Windows
+ 1
+ msvcrtd.lib;kernel32.lib
+ true
+
+
+
+
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+ Level3
+ ProgramDatabase
+ Disabled
+
+
+ MachineX86
+ true
+ Windows
+
+
+
+
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;DEBUGZLIB_EXPORTS;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ Level3
+ ProgramDatabase
+
+
+ MachineX86
+ true
+ Windows
+ true
+ true
+
+
+
+
+
+
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 6d7bb210d..d388ac51f 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng15
Name: libpng
Description: Loads and saves PNG files
-Version: 1.5.0beta20
+Version: 1.5.0beta21
Libs: -L${libdir} -lpng15
Cflags: -I${includedir}
diff --git a/scripts/options.awk b/scripts/options.awk
index f323b0537..ffa4c4abf 100755
--- a/scripts/options.awk
+++ b/scripts/options.awk
@@ -1,7 +1,7 @@
#!/bin/awk -f
# scripts/options.awk - library build configuration control
#
-# libpng version 1.5.0beta17 - April 2, 2010
+# last changed in libpng version 1.5.0 - April 25, 2010
#
# Copyright (c) 1998-2010 Glenn Randers-Pehrson
#
diff --git a/scripts/pnglibconf.dfa b/scripts/pnglibconf.dfa
index c357600ed..c384449be 100644
--- a/scripts/pnglibconf.dfa
+++ b/scripts/pnglibconf.dfa
@@ -6,7 +6,7 @@
#
com pnglibconf.h - library build configuration
com
-com libpng version PNGLIB_VERSION - April 2, 2010
+com libpng version PNGLIB_VERSION - last changed on April 25, 2010
com
com Copyright (c) 1998-2010 Glenn Randers-Pehrson
com
diff --git a/scripts/pnglibconf.h b/scripts/pnglibconf.h
index 863d970f5..19ea03f31 100644
--- a/scripts/pnglibconf.h
+++ b/scripts/pnglibconf.h
@@ -1,7 +1,7 @@
-/* 1.5.0beta19 STANDARD API DEFINITION */
+/* libpng-1.5.0beta21 STANDARD API DEFINITION */
/* pnglibconf.h - library build configuration */
-/* libpng version 1.5.0beta19 - April 2, 2010 */
+/* last changed in libpng version 1.5.0 - April 25, 2010 */
/* Copyright (c) 1998-2010 Glenn Randers-Pehrson */
diff --git a/scripts/pngwin.def b/scripts/pngwin.def
index 3db2b9da8..2f8c83c5f 100644
--- a/scripts/pngwin.def
+++ b/scripts/pngwin.def
@@ -11,7 +11,7 @@ LIBRARY
;OS2 CODE PRELOAD MOVEABLE DISCARDABLE
EXPORTS
-;Version 1.5.0beta20
+;Version 1.5.0beta21
png_access_version_number @1
png_set_sig_bytes @2
png_sig_cmp @3
diff --git a/scripts/pngwin.dfn b/scripts/pngwin.dfn
index 8f06ebc23..7f55a1dbb 100644
--- a/scripts/pngwin.dfn
+++ b/scripts/pngwin.dfn
@@ -1,7 +1,7 @@
/* pngwin.dfn - define format of pngwin.def
*
- * Last changed in libpng 1.5.0 [March 12, 2010]
+ * Last changed in libpng version 1.5.0 [April 25, 2010]
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*
* This code is released under the libpng license.