| Index: third_party/libpng/LICENSE
|
| diff --git a/third_party/libpng/LICENSE b/third_party/libpng/LICENSE
|
| index 0e807087004d2b197fd65d2a20a3cb3e2e890de4..748a42945aea0508fb0ea64493503e0e2cea92ad 100644
|
| --- a/third_party/libpng/LICENSE
|
| +++ b/third_party/libpng/LICENSE
|
| @@ -12,20 +12,15 @@ pngusr.h is distributed under the MPL 1.1/GPL 2.0/LGPL 2.1 tri-license.
|
|
|
| This code is released under the libpng license.
|
|
|
| -libpng versions 1.2.6, August 15, 2004, through 1.2.52, November 20, 2014, are
|
| -Copyright (c) 2004, 2006-2014 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
|
| -
|
| - Cosmin Truta
|
| -
|
| -libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
|
| -Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
|
| -distributed according to the same disclaimer and license as libpng-1.0.6
|
| -with the following individuals added to the list of Contributing Authors
|
| +libpng versions 1.0.7, July 1, 2000, through 1.2.54, November 12, 2015, are
|
| +Copyright (c) 2000-2002, 2004, 2006-2015 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
|
| +added to the list of Contributing Authors:
|
|
|
| Simon-Pierre Cadieux
|
| Eric S. Raymond
|
| + Cosmin Truta
|
| Gilles Vollant
|
|
|
| and with the following additions to the disclaimer:
|
| @@ -38,18 +33,20 @@ and with the following additions to the disclaimer:
|
| the user.
|
|
|
| libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
|
| -Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
|
| -distributed according to the same disclaimer and license as libpng-0.96,
|
| -with the following individuals added to the list of Contributing Authors:
|
| +Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
|
| +libpng-0.96, and are distributed according to the same disclaimer and
|
| +license as libpng-0.96, with the following individuals added to the list
|
| +of Contributing Authors:
|
|
|
| Tom Lane
|
| Glenn Randers-Pehrson
|
| Willem van Schaik
|
|
|
| libpng versions 0.89, June 1996, through 0.96, May 1997, are
|
| -Copyright (c) 1996, 1997 Andreas Dilger
|
| -Distributed according to the same disclaimer and license as libpng-0.88,
|
| -with the following individuals added to the list of Contributing Authors:
|
| +Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
|
| +and are distributed according to the same disclaimer and license as
|
| +libpng-0.88, with the following individuals added to the list of
|
| +Contributing Authors:
|
|
|
| John Bowler
|
| Kevin Bracey
|
| @@ -59,7 +56,7 @@ with the following individuals added to the list of Contributing Authors:
|
| Tom Tanner
|
|
|
| libpng versions 0.5, May 1995, through 0.88, January 1996, are
|
| -Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
|
| +Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
|
|
|
| For the purposes of this copyright and license, "Contributing Authors"
|
| is defined as the following set of individuals:
|
| @@ -82,13 +79,13 @@ Permission is hereby granted to use, copy, modify, and distribute this
|
| source code, or portions hereof, for any purpose, without fee, subject
|
| 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
|
| - be misrepresented as being the original source.
|
| + 2. Altered versions must be plainly marked as such and must not
|
| + be misrepresented as being the original source.
|
|
|
| -3. This Copyright notice may not be removed or altered from any
|
| - source or altered source distribution.
|
| + 3. This Copyright notice may not be removed or altered from any
|
| + source or altered source distribution.
|
|
|
| The Contributing Authors and Group 42, Inc. specifically permit, without
|
| fee, and encourage the use of this source code as a component to
|
| @@ -96,18 +93,20 @@ supporting the PNG file format in commercial products. If you use this
|
| source code in a product, acknowledgment is not required but would be
|
| appreciated.
|
|
|
| +END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
|
|
|
| A "png_get_copyright" function is available, for convenient use in "about"
|
| boxes and the like:
|
|
|
| - printf("%s",png_get_copyright(NULL));
|
| + printf("%s", png_get_copyright(NULL));
|
|
|
| Also, the PNG logo (in PNG format, of course) is supplied in the
|
| files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
|
|
|
| -Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a
|
| -certification mark of the Open Source Initiative.
|
| +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 version 1.0.7.
|
|
|
| Glenn Randers-Pehrson
|
| glennrp at users.sourceforge.net
|
| -November 20, 2014
|
| +November 12, 2015
|
|
|