diff --git a/ANNOUNCE b/ANNOUNCE index eb2ea1e6b..6604e7ecb 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.14beta01 - September 27, 2012 +Libpng 1.5.14beta01 - September 29, 2012 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. @@ -24,33 +24,10 @@ Other information: 1.5.14beta01-README.txt 1.5.14beta01-LICENSE.txt -Changes since the last public release (1.5.12): +Changes since the last public release (1.5.13): -Version 1.5.13beta01 [August 8, 2012] - Do not compile PNG_DEPRECATED, PNG_ALLOC and PNG_PRIVATE when __GNUC__ < 3. - Removed references to png_zalloc() and png_zfree() from the manual. - Revised PNG_FP_EXPORT and PNG_FIXED_EXPORT macros to avoid generating - lone semicolons (patch ported from libpng-1.6.0beta11). - -Version 1.5.13beta02 [September 10, 2012] - Corrected handling of the image array and the row_pointers array in example.c - When png_set_filler is used to strip a filler channel during write, the - code prior to 1.5 would ignore the case where the output required an - alpha channel or when the output was a palettized PNG. In libpng-1.5 the - ignorance was lost and libpng proceeded to strip the channel resulting - in a bad (potential memory overwrite) failure later. This reverts - the behavior to the pre-1.5 state but issues a warning. libpng-1.6 is - expected to issue an error on the erroneous png_set_filler call. - Use png_memset() consistently (pngmem.c contained some bare "memset" calls). - -Version 1.5.13rc01 [September 17, 2012] - No changes. - -Version 1.5.13 [September 27, 2012] - No changes. - -Version 1.5.14beta01 [September 27, 2012] Added -DZ_SOLO to contrib/pngminim/*/makefile to work with zlib-1.2.7 + Warn about the incorrect runtime library setting for VS2010 debug DLL builds. Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit diff --git a/CHANGES b/CHANGES index a4d4a8529..ffdf1dbd2 100644 --- a/CHANGES +++ b/CHANGES @@ -3919,8 +3919,9 @@ Version 1.5.13rc01 [September 17, 2012] Version 1.5.13 [September 27, 2012] No changes. -Version 1.5.14beta01 [September 27, 2012] +Version 1.5.14beta01 [September 29, 2012] Added -DZ_SOLO to contrib/pngminim/*/makefile to work with zlib-1.2.7 + Warn about the incorrect runtime library setting for VS2010 debug DLL builds. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/projects/vstudio/WARNING b/projects/vstudio/WARNING new file mode 100644 index 000000000..16968138d --- /dev/null +++ b/projects/vstudio/WARNING @@ -0,0 +1,23 @@ +WARNING +======= +Libpng 1.5 erroneously uses /MD when building debug DLL versions of libpng. +It should use /MDd - you can change this under properties\C/C++\Code +Generation\Runtime Library if you need to use the debug runtime for debug +builds. This will be changed in libpng 1.6 but is currently retained for +compatibility with older libpng 1.5 releases. + +The runtime library settings for each build are as follows: + + Release Debug +DLL /MD /MD +Library /MT /MTd + +The Visual Studio 2010 defaults for a Win32 DLL or Static Library project are +as follows: + + Release Debug +DLL /MD /MDd +Static Library /MD /MDd + +Notice that by default static library builds use the DLL runtime, not the +static library runtime. diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 08cc6ffc6..6cff04cc1 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.14beta01 - September 27, 2012 +libpng version 1.5.14beta01 - September 29, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -13,6 +13,14 @@ 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. +WARNING +======= +Libpng 1.5 erroneously uses /MD when building debug DLL versions of libpng. +It should use /MDd - you can change this under properties\C/C++\Code +Generation\Runtime Library if you need to use the debug runtime for debug +builds. This will be changed in libpng 1.6 but is currently retained for +compatibility with older libpng 1.5 releases. + Initial preparations ==================== You must enter some information in zlib.props before attempting to build diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 5f71c8174..71e949939 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@