diff --git a/ANNOUNCE b/ANNOUNCE index 871a33e86..842e46618 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.10beta04 - February 25, 2014 +Libpng 1.6.10beta04 - 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. @@ -87,7 +87,9 @@ Version 1.6.10beta03 [February 25, 2014] Moved some documentation from png.h to libpng.3 and libpng-manual.txt Minor editing of contrib/arm-neon/README and contrib/examples/*.c -Version 1.6.10beta04 [February 25, 2014] +Version 1.6.10beta04 [February 27, 2014] + 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 edd720e28..40720551d 100644 --- a/CHANGES +++ b/CHANGES @@ -4861,7 +4861,9 @@ Version 1.6.10beta03 [February 25, 2014] Moved some documentation from png.h to libpng.3 and libpng-manual.txt Minor editing of contrib/arm-neon/README and contrib/examples/*.c -Version 1.6.10beta04 [February 25, 2014] +Version 1.6.10beta04 [February 27, 2014] + 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 ce4a0918f..3da4a0bcf 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.6.10beta04 - February 25, 2014 + libpng version 1.6.10beta04 - 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.6.10beta04 - February 25, 2014 + libpng versions 0.97, January 1998, through 1.6.10beta04 - February 27, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -274,10 +274,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. @@ -5117,7 +5117,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. @@ -5414,7 +5414,7 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -February 25, 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 c7d085a29..6e4ebc598 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "February 25, 2014" +.TH LIBPNG 3 "February 27, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.10beta04 .SH SYNOPSIS @@ -504,7 +504,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.6.10beta04 - February 25, 2014 + libpng version 1.6.10beta04 - February 27, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.10beta04 - February 25, 2014 + libpng versions 0.97, January 1998, through 1.6.10beta04 - February 27, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -778,10 +778,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. @@ -5622,7 +5622,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. @@ -5919,7 +5919,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -February 25, 2014 +February 27, 2014 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6213,7 +6213,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.10beta04 - February 25, 2014: +Libpng version 1.6.10beta04 - 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). @@ -6236,7 +6236,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.10beta04, February 25, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.10beta04, 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 @@ -6335,7 +6335,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 25, 2014 +February 27, 2014 .\" end of man page diff --git a/scripts/pnglibconf.dfa b/scripts/pnglibconf.dfa index 44e2e07e4..4d4ea8a3b 100755 --- a/scripts/pnglibconf.dfa +++ b/scripts/pnglibconf.dfa @@ -164,7 +164,7 @@ logunsupported = 1 # NONE -# 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