Skip to content

Commit

Permalink
Modified the licence file and the licence header in all code files. T…
Browse files Browse the repository at this point in the history
…he licence is GPL v3 with the openSSL exception. Also added openSSL in the about dialog.
  • Loading branch information
ChristianFeldmann committed Feb 16, 2017
1 parent c3a4874 commit da837ba
Show file tree
Hide file tree
Showing 82 changed files with 2,780 additions and 987 deletions.
706 changes: 706 additions & 0 deletions LICENSE.GPL3

Large diffs are not rendered by default.

339 changes: 0 additions & 339 deletions LICENSE.txt

This file was deleted.

214 changes: 209 additions & 5 deletions docs/about.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,36 @@
<!--
/* This file is part of YUView - The YUV player with advanced analytics toolset
* <https://github.com/IENT/YUView>
* Copyright (C) 2015 Institut für Nachrichtentechnik, RWTH Aachen University, GERMANY
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of portions of this program with the
* OpenSSL library under certain conditions as described in each
* individual source file, and distribute linked combinations including
* the two.
*
* You must obey the GNU General Public License in all respects for all
* of the code used other than OpenSSL. If you modify file(s) with this
* exception, you may extend this exception to your version of the
* file(s), but you are not obligated to do so. If you do not wish to do
* so, delete this exception statement from your version. If you delete
* this exception statement from all source files in the program, then
* also delete it here.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
//-->

<body style="font-family:Helvetica;line-height:110%">
<div style="margin:30px;">
Expand Down Expand Up @@ -50,17 +83,46 @@ <h1>Licenses</h1>
<li><a href="#ANGLE">ANGLE</a></li>
<li><a href="#libwinpthreads">libwinpthreads</a></li>
<li><a href="#libde265">libde265</a></li>

<li><a href="#openSSL">openSSL</a></li>
</ul>
<h2 id="refYUView">YUView</h2>
<p>
YUView is provided under the terms of the GPL. It is maintained on Github (<a href="https://github.com/IENT/YUView">YUView on
Github</a>). So feel free to contribute to this project.
YUView is provided under the terms of the GNU General Public License. It is maintained on Github (<a href="https://github.com/IENT/YUView">YUView on Github</a>). So feel free to contribute to this project.
</p>
<p></p>
<table border="1" style="border-style: dashed;">
<tr>
<td style="padding: 5px">
<p>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
</p>
<p>
In addition, as a special exception, the copyright holders give
permission to link the code of portions of this program with the
OpenSSL library under certain conditions as described in each
individual source file, and distribute linked combinations including
the two.
</p>
<p>
You must obey the GNU General Public License in all respects for all
of the code used other than OpenSSL. If you modify file(s) with this
exception, you may extend this exception to your version of the
file(s), but you are not obligated to do so. If you do not wish to do
so, delete this exception statement from your version. If you delete
this exception statement from all source files in the program, then
also delete it here.
</p>
<p>
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
</p>


<h3 style="text-align: center;">GNU GENERAL PUBLIC LICENSE</h3>
<p style="text-align: center;">Version 3, 29 June 2007</p>

Expand Down Expand Up @@ -1509,11 +1571,153 @@ <h4><a name="section6"></a>6. Revised Versions of the GNU Lesser General Public
permanent authorization for you to choose that version for the
Library.
</p>
</tdclass>
</tr>
</table>

<p>&copy; 2015 - Institut&nbsp;f&uuml;r&nbsp;Nachrichtentechnik<br>RWTH&nbsp;Aachen&nbsp;University</p>
<h2 id="openSSL">openSSL</h2>
<p>
The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
the OpenSSL License and the original SSLeay license apply to the toolkit.
See below for the actual license texts.
</p>
<table border="1" style="border-style: dashed;">
<tr>
<td style="padding: 5px">
<p style="text-align: center;">OpenSSL License</p>
<p style="text-align: center;">Copyright (c) 1998-2016 The OpenSSL Project. All rights reserved.</p>

<p>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
</p>
<p>
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
</p>
<p>
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
</p>
<p>
3. All advertising materials mentioning features or use of this
software must display the following acknowledgment:
"This product includes software developed by the OpenSSL Project
for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
</p>
<p>
4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[email protected].
</p>
<p>
5. Products derived from this software may not be called "OpenSSL"
nor may "OpenSSL" appear in their names without prior written
permission of the OpenSSL Project.
</p>
<p>
6. Redistributions of any form whatsoever must retain the following
acknowledgment:
"This product includes software developed by the OpenSSL Project
for use in the OpenSSL Toolkit (http://www.openssl.org/)"
</p>
<p>
THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.
</p>
<p>
This product includes cryptographic software written by Eric Young
([email protected]). This product includes software written by Tim
Hudson ([email protected]).
</p>
<p style="text-align: center;">Original SSLeay License</p>
<p style="text-align: center;">Copyright (C) 1995-1998 Eric Young ([email protected])</p>
<p style="text-align: center;">All rights reserved.</p>
<p>
This package is an SSL implementation written
by Eric Young ([email protected]).
The implementation was written so as to conform with Netscapes SSL.
</p>
<p>
This library is free for commercial and non-commercial use as long as
the following conditions are aheared to. The following conditions
apply to all code found in this distribution, be it the RC4, RSA,
lhash, DES, etc., code; not just the SSL code. The SSL documentation
included with this distribution is covered by the same copyright terms
except that the holder is Tim Hudson ([email protected]).
</p>
<p>
Copyright remains Eric Young's, and as such any Copyright notices in
the code are not to be removed.
If this package is used in a product, Eric Young should be given attribution
as the author of the parts of the library used.
This can be in the form of a textual message at program startup or
in documentation (online or textual) provided with the package.
</p>
<p>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
</p>
<p>
1. Redistributions of source code must retain the copyright
notice, this list of conditions and the following disclaimer.
</p>
<p>
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
</p>
<p>
3. All advertising materials mentioning features or use of this software
must display the following acknowledgement:
"This product includes cryptographic software written by
Eric Young ([email protected])"
The word 'cryptographic' can be left out if the rouines from the library
being used are not cryptographic related :-).
</p>
<p>
4. If you include any Windows specific code (or a derivative thereof) from
the apps directory (application code) you must include an acknowledgement:
"This product includes software written by Tim Hudson ([email protected])"
</p>
<p>
THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
</p>
<p>
The licence and distribution terms for any publically available version or
derivative of this code cannot be changed. i.e. this code cannot simply be
copied and put under another distribution licence
[including the GNU Public Licence.]
</p>
</td>
</tr>
</table>

<p>&copy; 2015 - Institut&nbsp;f&uuml;r&nbsp;Nachrichtentechnik<br>RWTH&nbsp;Aachen&nbsp;University</p>
</div>
</div>
</body>
Loading

0 comments on commit da837ba

Please sign in to comment.