summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-09-27 10:20:23 +0100
committerCarl Hetherington <cth@carlh.net>2016-09-27 10:20:23 +0100
commitff5a8396812aa3dfaa6010915199519e535fcec3 (patch)
tree3436ab1592d7d0fbc9321a51af82c52a4c1728fb /tools
parent0acd045b0e911427db96dbd186d551ab9f96c4fc (diff)
Fix GPL boilerplate in tools/
Diffstat (limited to 'tools')
-rw-r--r--tools/common.cc15
-rw-r--r--tools/dcpdiff.cc14
-rw-r--r--tools/dcpdumpsub.cc14
-rw-r--r--tools/dcpinfo.cc14
4 files changed, 56 insertions, 1 deletions
diff --git a/tools/common.cc b/tools/common.cc
index aaa07fb2..cda6817b 100644
--- a/tools/common.cc
+++ b/tools/common.cc
@@ -15,6 +15,20 @@
You should have received a copy of the GNU General Public License
along with libdcp. If not, see <http://www.gnu.org/licenses/>.
+
+ 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.
*/
#include "common.h"
@@ -39,4 +53,3 @@ dcp::filter_errors (dcp::DCP::ReadErrors& errors, bool ignore_missing_assets)
i = tmp;
}
}
-
diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc
index d5bb3f92..1818f2b6 100644
--- a/tools/dcpdiff.cc
+++ b/tools/dcpdiff.cc
@@ -15,6 +15,20 @@
You should have received a copy of the GNU General Public License
along with libdcp. If not, see <http://www.gnu.org/licenses/>.
+
+ 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.
*/
#include "dcp.h"
diff --git a/tools/dcpdumpsub.cc b/tools/dcpdumpsub.cc
index 6cb641e4..014bb9e7 100644
--- a/tools/dcpdumpsub.cc
+++ b/tools/dcpdumpsub.cc
@@ -15,6 +15,20 @@
You should have received a copy of the GNU General Public License
along with libdcp. If not, see <http://www.gnu.org/licenses/>.
+
+ 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.
*/
#include "smpte_subtitle_asset.h"
diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc
index 7bb5f1b3..24e63d84 100644
--- a/tools/dcpinfo.cc
+++ b/tools/dcpinfo.cc
@@ -15,6 +15,20 @@
You should have received a copy of the GNU General Public License
along with libdcp. If not, see <http://www.gnu.org/licenses/>.
+
+ 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.
*/
#include "dcp.h"