Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add markup to Libpng.xml #2634

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 27 additions & 9 deletions src/Libpng.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,40 @@
copy and the notices in the file png.h that is included in the libpng distribution, the latter shall
prevail.</p>
<p>COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:</p>
<p>If you modify libpng you may insert additional notices immediately following this sentence.</p>
<p>This code is released under the libpng license.</p>
<p>libpng versions 1.2.6, August 15, 2004, through 1.4.5, December 9, 2010, are Copyright (c) 2004,
2006-2010 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as
<optional><p>If you modify libpng you may insert additional notices immediately following this sentence.</p>
<p>This code is released under the libpng license.</p></optional>

<optional><p>libpng versions 1.2.6, August 15, 2004, through <alt match=".+" name="version-date">1.4.5, December 9, 2010</alt>,
are Copyright (c) 2004, 2006-<alt match=".+" name="cyear1">2010</alt> 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</p>
<p>Cosmin Truta</p>
<p>libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
<p>Cosmin Truta</p></optional>

<p>libpng versions 1.0.7, July 1, 2000, through<alt match=".+" name="version-date2">1.2.5 - October 3, 2002</alt>, are
<br/>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
</p>
<p>Simon-Pierre Cadieux
<p>Simon-Pierre Cadieux
<br/>Eric S. Raymond
<optional><br/>Mans Rullgard
<br/>Cosmin Truta</optional>
<br/>Gilles Vollant
<optional><br/>James Yu</optional>
<optional><br/>Mandar Sahastrabuddhe</optional>
<optional><br/>Google Inc.</optional>
<optional><br/>Vadim Barkov</optional>
</p>
<p>and with the following additions to the disclaimer:</p>
<p>There is no warranty against interference with your enjoyment of the library or against infringement.
There is no warranty that our efforts or the library will fulfill any of your particular purposes or
needs. This library is provided with all faults, and the entire risk of satisfactory quality,
performance, accuracy, and effort is with the user.</p>

<optional><p>Some files in the "contrib" directory and some configure-generated
files that are distributed with libpng have other copyright owners, and
are released under other open source licenses.</p></optional>

<p>libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
<br/>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
Expand All @@ -41,7 +55,8 @@
</p>
<p>libpng versions 0.89, June 1996, through 0.96, May 1997, are
<br/>Copyright (c) 1996, 1997 Andreas Digger
<br/>Distributed according to the same disclaimer and license as libpng-0.88, with the following
<alt match=", and are distributed|Distributed" name="distributed">
<br/>Distributed</alt> according to the same disclaimer and license as libpng-0.88, with the following
individuals added to the list of Contributing Authors:
</p>
<p>John Bowler
Expand All @@ -51,8 +66,11 @@
<br/>Greg Roelofs
<br/>Tom Tanner
</p>
<optional><p>Some files in the "scripts" directory have other copyright owners,
but are released under this license.</p></optional>

<p>libpng versions 0.5, May 1995, through 0.88, January 1996, are
<br/>Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
<br/>Copyright (c) <alt match="1995, 1996|1995-1996" name="comma">1995, 1996</alt> Guy Eric Schalnat, Group 42, Inc.
</p>
<p>For the purposes of this copyright and license, "Contributing Authors" is defined as the following set of
individuals:</p>
Expand Down
Loading