From 3c7c436303b500feae3055b8cc28b6ab1c7fa5d6 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 13 Jul 2016 16:38:01 -0500 Subject: [PATCH] [libpng16] Imported from libpng-1.6.24beta05.tar --- INSTALL | 2 +- LICENSE | 4 ++-- README | 2 +- contrib/tools/reindent | 13 +++++++++++++ libpng-manual.txt | 4 ++-- libpng.3 | 12 ++++++------ libpngpf.3 | 2 +- png.5 | 2 +- projects/vstudio/README.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 12 files changed, 31 insertions(+), 18 deletions(-) create mode 100644 contrib/tools/reindent diff --git a/INSTALL b/INSTALL index e9c31e832..eed4dc8db 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 cd67da174..944da72c5 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 ade8d42f6..877cf1f13 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 000000000..1bc827f3a --- /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 c55c42ad0..2554f806f 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 f37c8dcaf..54940cef2 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 c31a5439f..a1dda810e 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 287e0cd46..b4fe7489f 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 ad2302222..8876f9b09 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 c374a845f..fb1a0326a 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@