Update the export control information
Also reformat the license text.
This commit is contained in:
parent
a873893279
commit
c36c09f004
46
LICENSE
46
LICENSE
@ -1,12 +1,13 @@
|
|||||||
|
|
||||||
This copy of the libpng notices is provided for your convenience. In case of
|
This copy of the libpng notices is provided for your convenience.
|
||||||
any discrepancy between this copy and the notices in the file png.h that is
|
In case of any discrepancy between this copy and the notices in the
|
||||||
included in the libpng distribution, the latter shall prevail.
|
file png.h that is included in the libpng distribution, the latter
|
||||||
|
shall prevail.
|
||||||
|
|
||||||
COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
|
COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
|
||||||
|
|
||||||
If you modify libpng you may insert additional notices immediately following
|
If you modify libpng, you may insert additional notices immediately
|
||||||
this sentence.
|
following this sentence.
|
||||||
|
|
||||||
This code is released under the libpng license.
|
This code is released under the libpng license.
|
||||||
|
|
||||||
@ -30,22 +31,22 @@ added to the list of Contributing Authors:
|
|||||||
|
|
||||||
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 the
|
There is no warranty against interference with your enjoyment of
|
||||||
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 with
|
risk of satisfactory quality, performance, accuracy, and effort is
|
||||||
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
|
||||||
are released under other open source licenses.
|
are released under other open source licenses.
|
||||||
|
|
||||||
libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
|
libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
|
||||||
Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
|
Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
|
||||||
libpng-0.96, and are distributed according to the same disclaimer and
|
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
|
license as libpng-0.96, with the following individuals added to the
|
||||||
of Contributing Authors:
|
list of Contributing Authors:
|
||||||
|
|
||||||
Tom Lane
|
Tom Lane
|
||||||
Glenn Randers-Pehrson
|
Glenn Randers-Pehrson
|
||||||
@ -64,7 +65,7 @@ Contributing Authors:
|
|||||||
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.
|
||||||
|
|
||||||
libpng versions 0.5, May 1995, through 0.88, January 1996, are
|
libpng versions 0.5, May 1995, through 0.88, January 1996, are
|
||||||
@ -117,15 +118,16 @@ jurisdiction where common-law trademark is recognized.
|
|||||||
|
|
||||||
OSI CERTIFICATION:
|
OSI CERTIFICATION:
|
||||||
|
|
||||||
Libpng is OSI Certified Open Source Software. OSI Certified Open Source is
|
libpng is OSI Certified Open Source Software. OSI Certified Open Source
|
||||||
a certification mark of the Open Source Initiative. OSI has not addressed
|
is a certification mark of the Open Source Initiative. OSI has not
|
||||||
the additional disclaimers inserted at version 1.0.7.
|
addressed the additional disclaimers inserted at libpng version 1.0.7.
|
||||||
|
|
||||||
EXPORT CONTROL:
|
EXPORT CONTROL:
|
||||||
|
|
||||||
The Copyright owner believes that the Export Control Classification
|
The Copyright owner believes that libpng is not subject to U.S. or
|
||||||
Number (ECCN) for libpng is EAR99, which means not subject to export
|
Canadian export controls, because it is open source, publicly available
|
||||||
controls or International Traffic in Arms Regulations (ITAR) because
|
software, that does not contain any encryption software.
|
||||||
it is open source, publicly available software, that does not contain
|
|
||||||
any encryption software. See the EAR, paragraphs 734.3(b)(3) and
|
libpng may be subject to export control laws in other countries.
|
||||||
734.7(b).
|
|
||||||
|
(The Copyright owner is neither a lawyer, nor an exports officer.)
|
||||||
|
39
png.h
39
png.h
@ -21,8 +21,8 @@
|
|||||||
/*
|
/*
|
||||||
* COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
|
* COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
|
||||||
*
|
*
|
||||||
* If you modify libpng you may insert additional notices immediately following
|
* If you modify libpng, you may insert additional notices immediately
|
||||||
* this sentence.
|
* following this sentence.
|
||||||
*
|
*
|
||||||
* This code is released under the libpng license.
|
* This code is released under the libpng license.
|
||||||
*
|
*
|
||||||
@ -46,22 +46,22 @@
|
|||||||
*
|
*
|
||||||
* 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 the
|
* There is no warranty against interference with your enjoyment of
|
||||||
* 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 with
|
* risk of satisfactory quality, performance, accuracy, and effort is
|
||||||
* 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
|
||||||
* are released under other open source licenses.
|
* are released under other open source licenses.
|
||||||
*
|
*
|
||||||
* libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
|
* libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
|
||||||
* Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
|
* Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
|
||||||
* libpng-0.96, and are distributed according to the same disclaimer and
|
* 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
|
* license as libpng-0.96, with the following individuals added to the
|
||||||
* of Contributing Authors:
|
* list of Contributing Authors:
|
||||||
*
|
*
|
||||||
* Tom Lane
|
* Tom Lane
|
||||||
* Glenn Randers-Pehrson
|
* Glenn Randers-Pehrson
|
||||||
@ -80,7 +80,7 @@
|
|||||||
* 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.
|
||||||
*
|
*
|
||||||
* libpng versions 0.5, May 1995, through 0.88, January 1996, are
|
* libpng versions 0.5, May 1995, through 0.88, January 1996, are
|
||||||
@ -133,18 +133,19 @@
|
|||||||
*
|
*
|
||||||
* OSI CERTIFICATION:
|
* OSI CERTIFICATION:
|
||||||
*
|
*
|
||||||
* Libpng is OSI Certified Open Source Software. OSI Certified Open Source is
|
* libpng is OSI Certified Open Source Software. OSI Certified Open Source
|
||||||
* a certification mark of the Open Source Initiative. OSI has not addressed
|
* is a certification mark of the Open Source Initiative. OSI has not
|
||||||
* the additional disclaimers inserted at version 1.0.7.
|
* addressed the additional disclaimers inserted at libpng version 1.0.7.
|
||||||
*
|
*
|
||||||
* EXPORT CONTROL:
|
* EXPORT CONTROL:
|
||||||
*
|
*
|
||||||
* The Copyright owner believes that the Export Control Classification
|
* The Copyright owner believes that libpng is not subject to U.S. or
|
||||||
* Number (ECCN) for libpng is EAR99, which means not subject to export
|
* Canadian export controls, because it is open source, publicly available
|
||||||
* controls or International Traffic in Arms Regulations (ITAR) because
|
* software, that does not contain any encryption software.
|
||||||
* it is open source, publicly available software, that does not contain
|
*
|
||||||
* any encryption software. See the EAR, paragraphs 734.3(b)(3) and
|
* libpng may be subject to export control laws in other countries.
|
||||||
* 734.7(b).
|
*
|
||||||
|
* (The Copyright owner is neither a lawyer, nor an exports officer.)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user