diff --git a/INSTALL b/INSTALL index e9c31e832a7c35b5c4311c6045100c58cbb9ccba..eed4dc8db772c70db183e1c899ffa0938709aed4 100644 --- a/INSTALL +++ b/INSTALL @@ -79,7 +79,7 @@ Or you can use one of the "projects" in the "projects" directory. Before installing libpng, you must first install zlib, if it is not already on your system. zlib can usually be found wherever you got libpng; otherwise go to http://zlib.net. You can place -zlib in in the same directory as libpng or in another directory. +zlib in the same directory as libpng or in another directory. If your system already has a preinstalled zlib you will still need to have access to the zlib.h and zconf.h include files that diff --git a/LICENSE b/LICENSE index cd67da17441df6e1324451b2d4af656860f593f4..944da72c5b497af47bab69d95130acdaa6f2aa96 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.24beta05, July 8, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.24beta05, July 13, 2016 are Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -127,4 +127,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 8, 2016 +July 13, 2016 diff --git a/README b/README index ade8d42f60efb258d9fd70cd7ccec39be45aec00..877cf1f136b09441120f7ebc80f6689a1b86141e 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.24beta05 - July 8, 2016 (shared library 16.0) +README for libpng version 1.6.24beta05 - July 13, 2016 (shared library 16.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. diff --git a/contrib/tools/reindent b/contrib/tools/reindent new file mode 100644 index 0000000000000000000000000000000000000000..1bc827f3a9720613e7ad956b0fd6468a01005b2e --- /dev/null +++ b/contrib/tools/reindent @@ -0,0 +1,13 @@ +#!/bin/sh + +# reindent inputabsize outputabsize inputcontinuestring outputcontinuestring +# eg, to change libpng coding style from 3-space indentation to 4-space +# +# reindent 3 4 " " " " < example.c.orig > example.c +# +# Assumes that continued lines begin with indentation plus one space, and +# that continued comments begin with indentation plus " *". + +unexpand --first-only --t $inputtabsize $1 | \ + sed -e "/^ $3[^\*]/{s/ $3/ $4/}" | \ + expand -t $2 diff --git a/libpng-manual.txt b/libpng-manual.txt index c55c42ad0dcb9ee6cdf2132b2a1ce365f65690d5..2554f806fabb923c1cc239c1608b32a03e4a927d 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.24beta05 - July 8, 2016 + libpng version 1.6.24beta05 - July 13, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 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.24beta05 - July 8, 2016 + libpng versions 0.97, January 1998, through 1.6.24beta05 - July 13, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson diff --git a/libpng.3 b/libpng.3 index f37c8dcaf65ad626cd8da440afa3260603c34f75..54940cef2ae8f194acaee97266ff6012bab717e5 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "July 8, 2016" +.TH LIBPNG 3 "July 13, 2016" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.24beta05 .SH SYNOPSIS @@ -510,7 +510,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.24beta05 - July 8, 2016 + libpng version 1.6.24beta05 - July 13, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -521,7 +521,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.24beta05 - July 8, 2016 + libpng versions 0.97, January 1998, through 1.6.24beta05 - July 13, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -6018,7 +6018,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.24beta05 - July 8, 2016: +Libpng version 1.6.24beta05 - July 13, 2016: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6043,7 +6043,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.24beta05, July 8, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.24beta05, July 13, 2016 are Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -6168,7 +6168,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 8, 2016 +July 13, 2016 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index c31a5439ff9afa1de8e1b211cba2f52079228956..a1dda810ea8938caee952eced1f668c3740dba14 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "July 8, 2016" +.TH LIBPNGPF 3 "July 13, 2016" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.24beta05 (private functions) diff --git a/png.5 b/png.5 index 287e0cd46099718e6c4a41558e4e93686a9eae84..b4fe7489f7fac194c1856de804f9596ebcb00cca 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "July 8, 2016" +.TH PNG 5 "July 13, 2016" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index ad2302222716b96d973f5669fd42b2430c4e705a..8876f9b094550bb228e380e7f2271ce0a0d73c3b 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.24beta05 - July 8, 2016 +libpng version 1.6.24beta05 - July 13, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index c374a845f63601d0a7f4621019bd604310d16af5..fb1a0326abc30b9c9285f82e1477c38cd4776f98 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@