cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce the PNG Reference Library License version 2

Browse Source 
The new libpng license comprises the terms and conditions from the zlib
license, and the disclaimer from the Boost license.

The legacy libpng license, used until libpng-1.6.35, is appended to the
new license, following the precedent established in the Python Software
Foundation License version 2.

From now on, the list of contributing authors shall be maintained in a
separate AUTHORS file.

The lists of previous contributing authors, mentioned in the legacy
libpng license and considered to be an integral part of that license,
are kept intact, with no further updates.
This commit is contained in:
Cosmin Truta 2018-11-05 23:49:39 -05:00
parent 81a65de25d
commit e79085a172
4 changed files with 225 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
AUTHORS Normal file
View File

@ -0,0 +1,45 @@
PNG REFERENCE LIBRARY AUTHORS
=============================
This is the list of PNG Reference Library ("libpng") Contributing
Authors, for copyright and licensing purposes.
* Andreas Dilger
* Cosmin Truta
* Dave Martindale
* Eric S. Raymond
* Gilles Vollant
* Glenn Randers-Pehrson
* Greg Roelofs
* Guy Eric Schalnat
* James Yu
* John Bowler
* Kevin Bracey
* Magnus Holmgren
* Mandar Sahastrabuddhe
* Mans Rullgard
* Matt Sarett
* Mike Klein
* Paul Schmidt
* Sam Bushell
* Samuel Williams
* Simon-Pierre Cadieux
* Tim Wegner
* Tom Lane
* Tom Tanner
* Vadim Barkov
* Willem van Schaik
* Zhijie Liang
* Arm Holdings
- Richard Townsend
* Google Inc.
- Matt Sarett
- Mike Klein
The build projects, the build scripts, the test scripts, and other
files in the "projects", "scripts" and "tests" directories, have other
copyright owners, but are released under the libpng license.
Some files in the "contrib" directory, and some tools-generated files
that are distributed with libpng, have other copyright owners, and are
released under other open source licenses.

162
LICENSE
View File

@ -1,17 +1,48 @@
This copy of the libpng notices is provided for your convenience. This copy of the libpng notices is provided for your convenience.
In case of any discrepancy between this copy and the notices in the In case of any discrepancy between this copy and the notices in the
file png.h that is included in the libpng distribution, the latter file png.h that is included in the libpng distribution, the latter
shall prevail. shall prevail.
COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
=========================================
If you modify libpng, you may insert additional notices immediately PNG Reference Library License version 2
following this sentence. ---------------------------------------
This code is released under the libpng license. * Copyright (c) 1995-2018 The PNG Reference Library Authors.
* Copyright (c) 2018 Cosmin Truta.
* Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
* Copyright (c) 1996-1997 Andreas Dilger.
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
Copyright (c) 2018 Cosmin Truta. The software is supplied "as is", without warranty of any kind,
express or implied, including, without limitation, the warranties
of merchantability, fitness for a particular purpose, title, and
non-infringement. In no even shall the Copyright owners, or
anyone distributing the software, be liable for any damages or
other liability, whether in contract, tort or otherwise, arising
from, out of, or in connection with the software, or the use or
other dealings in the software, even if advised of the possibility
of such damage.
Permission is hereby granted to use, copy, modify, and distribute
this software, or portions hereof, for any purpose, without fee,
subject to the following restrictions:
1. The origin of this software must not be misrepresented; you
must not claim that you wrote the original software. If you
use this software in a product, an acknowledgment in the product
documentation would be appreciated, but is not required.
2. Altered source versions must be plainly marked as such, and must
not be misrepresented as being the original software.
3. This Copyright notice may not be removed or altered from any
source or altered source distribution.
PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35)
-----------------------------------------------------------------------
libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
@ -19,24 +50,24 @@ 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 disclaimer and license as libpng-1.0.6 with the following individuals
added to the list of Contributing Authors: added to the list of Contributing Authors:
Simon-Pierre Cadieux Simon-Pierre Cadieux
Eric S. Raymond Eric S. Raymond
Mans Rullgard Mans Rullgard
Cosmin Truta Cosmin Truta
Gilles Vollant Gilles Vollant
James Yu James Yu
Mandar Sahastrabuddhe Mandar Sahastrabuddhe
Google Inc. Google Inc.
Vadim Barkov Vadim Barkov
and with the following additions to the disclaimer: and with the following additions to the disclaimer:
There is no warranty against interference with your enjoyment of There is no warranty against interference with your enjoyment of
the library or against infringement. There is no warranty that our the library or against infringement. There is no warranty that our
efforts or the library will fulfill any of your particular purposes efforts or the library will fulfill any of your particular purposes
or needs. This library is provided with all faults, and the entire or needs. This library is provided with all faults, and the entire
risk of satisfactory quality, performance, accuracy, and effort is risk of satisfactory quality, performance, accuracy, and effort is
with the user. with the user.
Some files in the "contrib" directory and some configure-generated Some files in the "contrib" directory and some configure-generated
files that are distributed with libpng have other copyright owners, and files that are distributed with libpng have other copyright owners, and
@ -48,9 +79,9 @@ libpng-0.96, and are distributed according to the same disclaimer and
license as libpng-0.96, with the following individuals added to the license as libpng-0.96, with the following individuals added to the
list of Contributing Authors: list of Contributing Authors:
Tom Lane Tom Lane
Glenn Randers-Pehrson Glenn Randers-Pehrson
Willem van Schaik Willem van Schaik
libpng versions 0.89, June 1996, through 0.96, May 1997, are libpng versions 0.89, June 1996, through 0.96, May 1997, are
Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88, Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
@ -58,12 +89,12 @@ and are distributed according to the same disclaimer and license as
libpng-0.88, with the following individuals added to the list of libpng-0.88, with the following individuals added to the list of
Contributing Authors: Contributing Authors:
John Bowler John Bowler
Kevin Bracey Kevin Bracey
Sam Bushell Sam Bushell
Magnus Holmgren Magnus Holmgren
Greg Roelofs Greg Roelofs
Tom Tanner Tom Tanner
Some files in the "scripts" directory have other copyright owners, Some files in the "scripts" directory have other copyright owners,
but are released under this license. but are released under this license.
@ -74,60 +105,35 @@ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
For the purposes of this copyright and license, "Contributing Authors" For the purposes of this copyright and license, "Contributing Authors"
is defined as the following set of individuals: is defined as the following set of individuals:
Andreas Dilger Andreas Dilger
Dave Martindale Dave Martindale
Guy Eric Schalnat Guy Eric Schalnat
Paul Schmidt Paul Schmidt
Tim Wegner Tim Wegner
The PNG Reference Library is supplied "AS IS". The Contributing Authors The PNG Reference Library is supplied "AS IS". The Contributing
and Group 42, Inc. disclaim all warranties, expressed or implied, Authors and Group 42, Inc. disclaim all warranties, expressed or
including, without limitation, the warranties of merchantability and of implied, including, without limitation, the warranties of
fitness for any purpose. The Contributing Authors and Group 42, Inc. merchantability and of fitness for any purpose. The Contributing
assume no liability for direct, indirect, incidental, special, exemplary, Authors and Group 42, Inc. assume no liability for direct, indirect,
or consequential damages, which may result from the use of the PNG incidental, special, exemplary, or consequential damages, which may
Reference Library, even if advised of the possibility of such damage. result from the use of the PNG Reference Library, even if advised of
the possibility of such damage.
Permission is hereby granted to use, copy, modify, and distribute this Permission is hereby granted to use, copy, modify, and distribute this
source code, or portions hereof, for any purpose, without fee, subject source code, or portions hereof, for any purpose, without fee, subject
to the following restrictions: to the following restrictions:
1. The origin of this source code must not be misrepresented. 1. The origin of this source code must not be misrepresented.
2. Altered versions must be plainly marked as such and must not 2. Altered versions must be plainly marked as such and must not
be misrepresented as being the original source. be misrepresented as being the original source.
3. This Copyright notice may not be removed or altered from any 3. This Copyright notice may not be removed or altered from any
source or altered source distribution. source or altered source distribution.
The Contributing Authors and Group 42, Inc. specifically permit, without The Contributing Authors and Group 42, Inc. specifically permit,
fee, and encourage the use of this source code as a component to without fee, and encourage the use of this source code as a component
supporting the PNG file format in commercial products. If you use this to supporting the PNG file format in commercial products. If you use
source code in a product, acknowledgment is not required but would be this source code in a product, acknowledgment is not required but would
appreciated. be appreciated.
END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
TRADEMARK:
The name "libpng" has not been registered by the Copyright owner
as a trademark in any jurisdiction. However, because libpng has
been distributed and maintained world-wide, continually since 1995,
the Copyright owner claims "common-law trademark protection" in any
jurisdiction where common-law trademark is recognized.
OSI CERTIFICATION:
libpng is OSI Certified Open Source Software. OSI Certified Open Source
is a certification mark of the Open Source Initiative. OSI has not
addressed the additional disclaimers inserted at libpng version 1.0.7.
EXPORT CONTROL:
The Copyright owner believes that libpng is not subject to U.S. or
Canadian export controls, because it is open source, publicly available
software, that does not contain any encryption software.
libpng may be subject to export control laws in other countries.
(The Copyright owner is neither a lawyer, nor an exports officer.)

8
TRADEMARK Normal file
View File

@ -0,0 +1,8 @@
TRADEMARK
=========
The name "libpng" has not been registered by the Copyright owners
as a trademark in any jurisdiction. However, because libpng has
been distributed and maintained world-wide, continually since 1995,
the Copyright owners claim "common-law trademark protection" in any
jurisdiction where common-law trademark is recognized.

158
png.h
View File

@ -19,14 +19,46 @@
*/ */
/* /*
* COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: * COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
* =========================================
* *
* If you modify libpng, you may insert additional notices immediately * PNG Reference Library License version 2
* following this sentence. * ---------------------------------------
* *
* This code is released under the libpng license. * * Copyright (c) 1995-2018 The PNG Reference Library Authors.
* * Copyright (c) 2018 Cosmin Truta.
* * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
* * Copyright (c) 1996-1997 Andreas Dilger.
* * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
* *
* Copyright (c) 2018 Cosmin Truta. * The software is supplied "as is", without warranty of any kind,
* express or implied, including, without limitation, the warranties
* of merchantability, fitness for a particular purpose, title, and
* non-infringement. In no even shall the Copyright owners, or
* anyone distributing the software, be liable for any damages or
* other liability, whether in contract, tort or otherwise, arising
* from, out of, or in connection with the software, or the use or
* other dealings in the software, even if advised of the possibility
* of such damage.
*
* Permission is hereby granted to use, copy, modify, and distribute
* this software, or portions hereof, for any purpose, without fee,
* subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you
* must not claim that you wrote the original software. If you
* use this software in a product, an acknowledgment in the product
* documentation would be appreciated, but is not required.
*
* 2. Altered source versions must be plainly marked as such, and must
* not be misrepresented as being the original software.
*
* 3. This Copyright notice may not be removed or altered from any
* source or altered source distribution.
*
*
* PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35)
* -----------------------------------------------------------------------
* *
* libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are * libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
* Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
@ -34,24 +66,24 @@
* disclaimer and license as libpng-1.0.6 with the following individuals * disclaimer and license as libpng-1.0.6 with the following individuals
* added to the list of Contributing Authors: * added to the list of Contributing Authors:
* *
* Simon-Pierre Cadieux * Simon-Pierre Cadieux
* Eric S. Raymond * Eric S. Raymond
* Mans Rullgard * Mans Rullgard
* Cosmin Truta * Cosmin Truta
* Gilles Vollant * Gilles Vollant
* James Yu * James Yu
* Mandar Sahastrabuddhe * Mandar Sahastrabuddhe
* Google Inc. * Google Inc.
* Vadim Barkov * Vadim Barkov
* *
* and with the following additions to the disclaimer: * and with the following additions to the disclaimer:
* *
* There is no warranty against interference with your enjoyment of * There is no warranty against interference with your enjoyment of
* the library or against infringement. There is no warranty that our * the library or against infringement. There is no warranty that our
* efforts or the library will fulfill any of your particular purposes * efforts or the library will fulfill any of your particular purposes
* or needs. This library is provided with all faults, and the entire * or needs. This library is provided with all faults, and the entire
* risk of satisfactory quality, performance, accuracy, and effort is * risk of satisfactory quality, performance, accuracy, and effort is
* with the user. * with the user.
* *
* Some files in the "contrib" directory and some configure-generated * Some files in the "contrib" directory and some configure-generated
* files that are distributed with libpng have other copyright owners, and * files that are distributed with libpng have other copyright owners, and
@ -63,9 +95,9 @@
* license as libpng-0.96, with the following individuals added to the * license as libpng-0.96, with the following individuals added to the
* list of Contributing Authors: * list of Contributing Authors:
* *
* Tom Lane * Tom Lane
* Glenn Randers-Pehrson * Glenn Randers-Pehrson
* Willem van Schaik * Willem van Schaik
* *
* libpng versions 0.89, June 1996, through 0.96, May 1997, are * libpng versions 0.89, June 1996, through 0.96, May 1997, are
* Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88, * Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
@ -73,12 +105,12 @@
* libpng-0.88, with the following individuals added to the list of * libpng-0.88, with the following individuals added to the list of
* Contributing Authors: * Contributing Authors:
* *
* John Bowler * John Bowler
* Kevin Bracey * Kevin Bracey
* Sam Bushell * Sam Bushell
* Magnus Holmgren * Magnus Holmgren
* Greg Roelofs * Greg Roelofs
* Tom Tanner * Tom Tanner
* *
* Some files in the "scripts" directory have other copyright owners, * Some files in the "scripts" directory have other copyright owners,
* but are released under this license. * but are released under this license.
@ -89,63 +121,49 @@
* For the purposes of this copyright and license, "Contributing Authors" * For the purposes of this copyright and license, "Contributing Authors"
* is defined as the following set of individuals: * is defined as the following set of individuals:
* *
* Andreas Dilger * Andreas Dilger
* Dave Martindale * Dave Martindale
* Guy Eric Schalnat * Guy Eric Schalnat
* Paul Schmidt * Paul Schmidt
* Tim Wegner * Tim Wegner
* *
* The PNG Reference Library is supplied "AS IS". The Contributing Authors * The PNG Reference Library is supplied "AS IS". The Contributing
* and Group 42, Inc. disclaim all warranties, expressed or implied, * Authors and Group 42, Inc. disclaim all warranties, expressed or
* including, without limitation, the warranties of merchantability and of * implied, including, without limitation, the warranties of
* fitness for any purpose. The Contributing Authors and Group 42, Inc. * merchantability and of fitness for any purpose. The Contributing
* assume no liability for direct, indirect, incidental, special, exemplary, * Authors and Group 42, Inc. assume no liability for direct, indirect,
* or consequential damages, which may result from the use of the PNG * incidental, special, exemplary, or consequential damages, which may
* Reference Library, even if advised of the possibility of such damage. * result from the use of the PNG Reference Library, even if advised of
* the possibility of such damage.
* *
* Permission is hereby granted to use, copy, modify, and distribute this * Permission is hereby granted to use, copy, modify, and distribute this
* source code, or portions hereof, for any purpose, without fee, subject * source code, or portions hereof, for any purpose, without fee, subject
* to the following restrictions: * to the following restrictions:
* *
* 1. The origin of this source code must not be misrepresented. * 1. The origin of this source code must not be misrepresented.
* *
* 2. Altered versions must be plainly marked as such and must not * 2. Altered versions must be plainly marked as such and must not
* be misrepresented as being the original source. * be misrepresented as being the original source.
* *
* 3. This Copyright notice may not be removed or altered from any * 3. This Copyright notice may not be removed or altered from any
* source or altered source distribution. * source or altered source distribution.
* *
* The Contributing Authors and Group 42, Inc. specifically permit, without * The Contributing Authors and Group 42, Inc. specifically permit,
* fee, and encourage the use of this source code as a component to * without fee, and encourage the use of this source code as a component
* supporting the PNG file format in commercial products. If you use this * to supporting the PNG file format in commercial products. If you use
* source code in a product, acknowledgment is not required but would be * this source code in a product, acknowledgment is not required but would
* appreciated. * be appreciated.
* *
* END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE. * END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
* *
* TRADEMARK: * TRADEMARK
* =========
* *
* The name "libpng" has not been registered by the Copyright owner * The name "libpng" has not been registered by the Copyright owners
* as a trademark in any jurisdiction. However, because libpng has * as a trademark in any jurisdiction. However, because libpng has
* been distributed and maintained world-wide, continually since 1995, * been distributed and maintained world-wide, continually since 1995,
* the Copyright owner claims "common-law trademark protection" in any * the Copyright owners claim "common-law trademark protection" in any
* jurisdiction where common-law trademark is recognized. * jurisdiction where common-law trademark is recognized.
*
* OSI CERTIFICATION:
*
* libpng is OSI Certified Open Source Software. OSI Certified Open Source
* is a certification mark of the Open Source Initiative. OSI has not
* addressed the additional disclaimers inserted at libpng version 1.0.7.
*
* EXPORT CONTROL:
*
* The Copyright owner believes that libpng is not subject to U.S. or
* Canadian export controls, because it is open source, publicly available
* software, that does not contain any encryption software.
*
* libpng may be subject to export control laws in other countries.
*
* (The Copyright owner is neither a lawyer, nor an exports officer.)
*/ */
/* /*