diff --git a/ANNOUNCE b/ANNOUNCE index 534c7fe7f..eccb56a0c 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.19beta01 - February 17, 2014 +Libpng 1.5.19beta01 - February 27, 2014 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. @@ -27,10 +27,12 @@ Other information: Changes since the last public release (1.5.18): -Version 1.5.19beta01 [February 17, 2014] +Version 1.5.19beta01 [February 27, 2014] Moved redefines of png_error(), png_warning(), png_chunk_error(), and png_chunk_warning() from pngpriv.h to png.h to make them visible to libpng-calling applications. + Fixed typos in the manual and in scripts/pnglibconf.dfa (CFLAGS -> CPPFLAGS + and PNG_USR_CONFIG -> PNG_USER_CONFIG). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index ea7269349..68bba14b3 100644 --- a/CHANGES +++ b/CHANGES @@ -4203,10 +4203,12 @@ Version 1.5.18rc02 [January 30, 2014] Version 1.5.18 [February 6, 2014] No changes. -Version 1.5.19beta01 [February 17, 2014] +Version 1.5.19beta01 [February 27, 2014] Moved redefines of png_error(), png_warning(), png_chunk_error(), and png_chunk_warning() from pngpriv.h to png.h to make them visible to libpng-calling applications. + Fixed typos in the manual and in scripts/pnglibconf.dfa (CFLAGS -> CPPFLAGS + and PNG_USR_CONFIG -> PNG_USER_CONFIG). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/libpng-manual.txt b/libpng-manual.txt index c756da925..e1998b560 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1,6 +1,6 @@ Libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.5.19beta01 - February 6, 2014 + libpng version 1.5.19beta01 - February 27, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.19beta01 - February 6, 2014 + libpng versions 0.97, January 1998, through 1.5.19beta01 - February 27, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -255,10 +255,10 @@ This method of building a customized pnglibconf.h is illustrated in contrib/pngminim/*. See the "$(PNGCONF):" target in the makefile and pngusr.dfa in these directories. -C. Configuration using PNG_USR_CONFIG +C. Configuration using PNG_USER_CONFIG -If -DPNG_USR_CONFIG is added to the CFLAGS when pnglibconf.h is built the file -pngusr.h will automatically be included before the options in +If -DPNG_USER_CONFIG is added to the CPPFLAGS when pnglibconf.h is built, +the file pngusr.h will automatically be included before the options in scripts/pnglibconf.dfa are processed. Your pngusr.h file should contain only macro definitions turning features on or off or setting settings. @@ -4503,7 +4503,7 @@ pngconf.h no longer includes pngusr.h, therefore pngusr.h is ignored after the build of pnglibconf.h and it is never included in an application build. The rarely used alternative of adding a list of feature macros to the -CFLAGS setting in the build also still works; however, the macros will be +CPPFLAGS setting in the build also still works; however, the macros will be copied to pnglibconf.h and this may produce macro redefinition warnings when the individual C files are compiled. @@ -4673,7 +4673,7 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -February 6, 2014 +February 27, 2014 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 5e76f9c5b..7af6114fe 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "February 6, 2014" +.TH LIBPNG 3 "February 27, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.19beta01 .SH SYNOPSIS @@ -492,7 +492,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT Libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.5.19beta01 - February 6, 2014 + libpng version 1.5.19beta01 - February 27, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -503,7 +503,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.19beta01 - February 6, 2014 + libpng versions 0.97, January 1998, through 1.5.19beta01 - February 27, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -747,10 +747,10 @@ This method of building a customized pnglibconf.h is illustrated in contrib/pngminim/*. See the "$(PNGCONF):" target in the makefile and pngusr.dfa in these directories. -C. Configuration using PNG_USR_CONFIG +C. Configuration using PNG_USER_CONFIG -If \-DPNG_USR_CONFIG is added to the CFLAGS when pnglibconf.h is built the file -pngusr.h will automatically be included before the options in +If \-DPNG_USER_CONFIG is added to the CPPFLAGS when pnglibconf.h is built, +the file pngusr.h will automatically be included before the options in scripts/pnglibconf.dfa are processed. Your pngusr.h file should contain only macro definitions turning features on or off or setting settings. @@ -4996,7 +4996,7 @@ pngconf.h no longer includes pngusr.h, therefore pngusr.h is ignored after the build of pnglibconf.h and it is never included in an application build. The rarely used alternative of adding a list of feature macros to the -CFLAGS setting in the build also still works; however, the macros will be +CPPFLAGS setting in the build also still works; however, the macros will be copied to pnglibconf.h and this may produce macro redefinition warnings when the individual C files are compiled. @@ -5166,7 +5166,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -February 6, 2014 +February 27, 2014 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5464,7 +5464,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.19beta01 - February 6, 2014: +Libpng version 1.5.19beta01 - February 27, 2014: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5487,7 +5487,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.19beta01, February 6, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.5.19beta01, February 27, 2014, 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 @@ -5586,7 +5586,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 6, 2014 +February 27, 2014 .\" end of man page diff --git a/scripts/pnglibconf.dfa b/scripts/pnglibconf.dfa index 2b44aec00..357d283a1 100644 --- a/scripts/pnglibconf.dfa +++ b/scripts/pnglibconf.dfa @@ -149,7 +149,7 @@ logunsupported = 1 @# endif @#endif -# Note that PNG_USR_CONFIG only has an effect when building +# Note that PNG_USER_CONFIG only has an effect when building # pnglibconf.h setting USER_CONFIG