From 9616bf68823e78450d3916663526918cf428cda0 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 29 Dec 2015 08:24:38 -0600 Subject: [PATCH] [libpng16] In projects/vstudio, combined readme.txt and WARNING into README.txt --- ANNOUNCE | 5 ++- CHANGES | 3 +- projects/vstudio/{readme.txt => README.txt} | 44 +++++++++++++++++---- projects/vstudio/WARNING | 27 ------------- 4 files changed, 42 insertions(+), 37 deletions(-) rename projects/vstudio/{readme.txt => README.txt} (63%) delete mode 100644 projects/vstudio/WARNING diff --git a/ANNOUNCE b/ANNOUNCE index 93a981035..0078e757c 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.21beta04 - December 19, 2015 +Libpng 1.6.21beta04 - December 29, 2015 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. @@ -51,7 +51,8 @@ Version 1.6.21beta03 [December 18, 2015] This changes pngvalid to use BE random numbers; this used to produce errors but these should not be fixed as a result of the previous changes. -Version 1.6.21beta04 [December 19, 2015] +Version 1.6.21beta04 [December 29, 2015] + In projects/vstudio, combined readme.txt and WARNING into README.txt Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index c6c7ae463..0e597aae8 100644 --- a/CHANGES +++ b/CHANGES @@ -5472,7 +5472,8 @@ Version 1.6.21beta03 [December 18, 2015] This changes pngvalid to use BE random numbers; this used to produce errors but these should not be fixed as a result of the previous changes. -Version 1.6.21beta04 [December 19, 2015] +Version 1.6.21beta04 [December 29, 2015] + In projects/vstudio, combined readme.txt and WARNING into README.txt Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/projects/vstudio/readme.txt b/projects/vstudio/README.txt similarity index 63% rename from projects/vstudio/readme.txt rename to projects/vstudio/README.txt index 38e1f5af7..500e46507 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/README.txt @@ -1,9 +1,9 @@ VisualStudio instructions -libpng version 1.6.21beta04 - December 19, 2015 +libpng version 1.6.21beta04 - December 29, 2015 -Copyright (c) 1998-2010 Glenn Randers-Pehrson +Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson This code is released under the libpng license. For conditions of distribution and use, see the disclaimer @@ -38,16 +38,17 @@ In particular the runtime library is the "MultiThreaded DLL" version. If you use Visual Studio defaults to build your application you will have no problems. -If you don't use the Visual Studio defaults your application must still be built -with the default runtime option (/MD). If, for some reason, it is not then your -application will crash inside libpng16.dll as soon as libpng tries to read -from a file handle you pass in. +If you don't use the Visual Studio defaults your application must still be +built with the default runtime option (/MD). If, for some reason, it is not +then your application will crash inside libpng16.dll as soon as libpng +tries to read from a file handle you pass in. If you do not want to use the DLL, for example for a very small application, the 'release library' configuration may be more appropriate. This is built with a non-standard runtime library - the "MultiThreaded" version. When you build your application it must be compiled with this option (/MT), otherwise -it will not build (if you are lucky) or crash (if you are not.) +it will not build (if you are lucky) or crash (if you are not.) See the +WARNING file that is distributed along with this readme.txt. Stop reading here ================= @@ -63,3 +64,32 @@ track down.) 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. + +WARNING +======= +Libpng 1.6.x does not use the default run-time library when building static +library builds of libpng; instead of the shared DLL runtime it uses a static +runtime. If you need to change this make sure to change the setting on all the +relevant projects: + + libpng + zlib + all the test programs + +The runtime library settings for each build are as follows: + + Release Debug + DLL /MD /MDd + Library /MT /MTd + +NOTICE that libpng 1.5.x erroneously used /MD for Debug DLL builds; if you used +the debug builds in your app and you changed your app to use /MD you will need +to change it back to /MDd for libpng 1.6.0 and later. + +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 + diff --git a/projects/vstudio/WARNING b/projects/vstudio/WARNING deleted file mode 100644 index da002c937..000000000 --- a/projects/vstudio/WARNING +++ /dev/null @@ -1,27 +0,0 @@ -WARNING -======= -Libpng 1.6 does not use the default run-time library when building static -library builds of libpng; instead of the shared DLL runtime it uses a static -runtime. If you need to change this make sure to change the setting on all the -relevant projects: - -libpng -zlib -all the test programs - -The runtime library settings for each build are as follows: - - Release Debug -DLL /MD /MDd -Library /MT /MTd - -NOTICE that libpng 1.5 erroneously used /MD for Debug DLL builds; if you used -the debug builds in your app and you changed your app to use /MD you will need -to change it to /MDd for libpng 1.6. - -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