Still more licence fixups.

diff --git a/examples/make_dcp.cc b/examples/make_dcp.cc
index ae7890a58cce30b7e24f2badf70715ff4d9ff3db..94eef710978643bdfb3805b19bcf060c3e870e6d 100644 (file)
--- a/examples/make_dcp.cc
+++ b/examples/make_dcp.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /** @file examples/make_dcp.cc

diff --git a/examples/read_dcp.cc b/examples/read_dcp.cc
index 6cc9b67673718af73bba9c6f8bc16eab0ca7efd0..7bd1e2db686ce2133d0cfa755a537bf8e6ed75fb 100644 (file)
--- a/examples/read_dcp.cc
+++ b/examples/read_dcp.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /* If you are using an installed libdcp, these #includes would need to be changed to

diff --git a/src/asset.cc b/src/asset.cc
index 82ef44feccad02ecfc5da0e5534d2bc3472e304a..8753528b98005e2afea47953b9bffdaf1c56a032 100644 (file)
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/asset.cc

diff --git a/src/asset_reader.cc b/src/asset_reader.cc
index a78af4d3d84ac835f922dd1b4f518e344a1b5d13..8fddcda2bb33d194e62261167e95440742152168 100644 (file)
--- a/src/asset_reader.cc
+++ b/src/asset_reader.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "asset_reader.h"

diff --git a/src/asset_writer.cc b/src/asset_writer.cc
index 64ffee10c46c9d43f62b3d0e8f899b2cd5e9252f..06c476308c618d7016ea1ea1ff01e1b1e8f7c682 100644 (file)
--- a/src/asset_writer.cc
+++ b/src/asset_writer.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/asset_writer.h

diff --git a/src/atmos_asset.cc b/src/atmos_asset.cc
index e503b7c1530e6ee13d144a216132075643e67bf4..48774038766fefe294dcf2fa9504b0ca1e23fe9c 100644 (file)
--- a/src/atmos_asset.cc
+++ b/src/atmos_asset.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "atmos_asset.h"

diff --git a/src/certificate.cc b/src/certificate.cc
index 7d80e3009a9a280c4d95d373025d598f92ae91c0..c8e4e342d3db95ba8b4779d621424c46e1344bbc 100644 (file)
--- a/src/certificate.cc
+++ b/src/certificate.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/certificate.cc

diff --git a/src/certificate_chain.cc b/src/certificate_chain.cc
index e12b1e75757c78e9707d0d0531d8c119cdefc392..557c8d3752d0d4c62bd7ab05275bb2e72bd25fbb 100644 (file)
--- a/src/certificate_chain.cc
+++ b/src/certificate_chain.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/signer_chain.cc

diff --git a/src/colour_conversion.cc b/src/colour_conversion.cc
index 04589cf439b62a15af1ffbb512e5d9adc33d1fc0..7e4558be0c30da408d3bfc388326ee4d87c1c1a7 100644 (file)
--- a/src/colour_conversion.cc
+++ b/src/colour_conversion.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "colour_conversion.h"

diff --git a/src/colour_matrix.cc b/src/colour_matrix.cc
index 227535e70dda8c982c0955159f954e4db7a15e46..e7a992c8fd7c415f9d25dea4fd3c037ae30f72a1 100644 (file)
--- a/src/colour_matrix.cc
+++ b/src/colour_matrix.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "colour_matrix.h"

diff --git a/src/cpl.cc b/src/cpl.cc
index 8faf49bcab6311b5f1d9b971b0e9597ad461e2de..38f22d9428a7ade0bff46f0cd41ebb17258ace8f 100644 (file)
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "cpl.h"

diff --git a/src/data.cc b/src/data.cc
index 832416d4b31f9bed007bd395e05bdc403939c0ce..87c4c16004f0433d3cad92b8a435925f38c00b81 100644 (file)
--- a/src/data.cc
+++ b/src/data.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "data.h"

diff --git a/src/dcp.cc b/src/dcp.cc
index d152058659d08964618178b88f5a8d2833699e58..bb4a712826ee272529f5d53aa262da46fd483666 100644 (file)
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/dcp.cc

diff --git a/src/dcp_time.cc b/src/dcp_time.cc
index 2852a1eb0726ebb56e031b5ca3d30f5fc88f529c..170d7398beb2211c4e85679f2aabe8f64462cd93 100644 (file)
--- a/src/dcp_time.cc
+++ b/src/dcp_time.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/dcp_time.cc

diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc
index 7177892a30ef942307e069076c7cb42e1b983f2a..019783e038d0370415db7fa19a6a0e4d5c0e4a50 100644 (file)
--- a/src/decrypted_kdm.cc
+++ b/src/decrypted_kdm.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "decrypted_kdm.h"

diff --git a/src/decrypted_kdm_key.cc b/src/decrypted_kdm_key.cc
index 95bdb41e420778020be61c10a0b5d6192fdd1914..b7b30802fb5c0244295e49a01490e8bae31b1ffe 100644 (file)
--- a/src/decrypted_kdm_key.cc
+++ b/src/decrypted_kdm_key.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "decrypted_kdm_key.h"

diff --git a/src/encrypted_kdm.cc b/src/encrypted_kdm.cc
index 85c1f0d8850b22cd049c1d0e12182e453b10adec..61460b122f557c0a9a3094239644c7919a5838f4 100644 (file)
--- a/src/encrypted_kdm.cc
+++ b/src/encrypted_kdm.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "encrypted_kdm.h"

diff --git a/src/exceptions.cc b/src/exceptions.cc
index 258e6ff08c9f05fd2e87ea7451a19e707c1e066d..4bffd95774267912da7d292cc2ec227c9a1dc8d7 100644 (file)
--- a/src/exceptions.cc
+++ b/src/exceptions.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/exceptions.cc

diff --git a/src/file.cc b/src/file.cc
index 5f07c02cea0f074bdbae54ea14ac4ab3f552cc30..3408f1570bcb7b1b01776829b6e2ffb701cfabed 100644 (file)
--- a/src/file.cc
+++ b/src/file.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/file.cc

diff --git a/src/font_asset.cc b/src/font_asset.cc
index 743aade617504d887a00a00d762796bc6619de1d..43bedce18985d8e4eeaba03cf44bbba1b462aaa8 100644 (file)
--- a/src/font_asset.cc
+++ b/src/font_asset.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/font_asset.cc

diff --git a/src/font_node.cc b/src/font_node.cc
index c10721a278820ad9b9edbd728fefa4da8c56ecc9..d16997c959927a48f56dca6439cd69df89c99767 100644 (file)
--- a/src/font_node.cc
+++ b/src/font_node.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "types.h"

diff --git a/src/gamma_transfer_function.cc b/src/gamma_transfer_function.cc
index a97635450fe8ab04ff15c456adfff608d979829a..55f77302f9114afdfd488fd2d4282190ad28a795 100644 (file)
--- a/src/gamma_transfer_function.cc
+++ b/src/gamma_transfer_function.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/gamma_transfer_function.cc

diff --git a/src/interop_load_font_node.cc b/src/interop_load_font_node.cc
index d5a8151d7497c8635c9fc16181ade918aafbca93..439fe4539aadf16aba96df02eae3e3d8d0c6a8e2 100644 (file)
--- a/src/interop_load_font_node.cc
+++ b/src/interop_load_font_node.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "interop_load_font_node.h"

diff --git a/src/interop_subtitle_asset.cc b/src/interop_subtitle_asset.cc
index 4e66a329605a1a0d1dc488a5fa7fca84a7fd7493..97aa1a2c60805fc1779ad57b1b8fea97623b5753 100644 (file)
--- a/src/interop_subtitle_asset.cc
+++ b/src/interop_subtitle_asset.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "interop_subtitle_asset.h"

diff --git a/src/j2k.cc b/src/j2k.cc
index c84c738e002b4a038652c412ff49bc7a188a8868..27f2b66c9feae7f0a2a17ef68ae63f658eecb58e 100644 (file)
--- a/src/j2k.cc
+++ b/src/j2k.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "j2k.h"

diff --git a/src/key.cc b/src/key.cc
index e7f34c04113d91ba34ab0888ccb731285e1048f3..3cf785eca68d41be2a718e541c3a8021057f2986 100644 (file)
--- a/src/key.cc
+++ b/src/key.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/key.cc

diff --git a/src/local_time.cc b/src/local_time.cc
index fa810a92d719f8b4819e0803ffea3361a2aaf17b..66579dfb206fed6570b046766d00b5aa163a6c48 100644 (file)
--- a/src/local_time.cc
+++ b/src/local_time.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/local_time.cc

diff --git a/src/metadata.cc b/src/metadata.cc
index ec5ae3590cc4f0bd49e2fc75efe882c64544f188..130abffe492c50860df86bd140e889e799e17dab 100644 (file)
--- a/src/metadata.cc
+++ b/src/metadata.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/metadata.cc

diff --git a/src/modified_gamma_transfer_function.cc b/src/modified_gamma_transfer_function.cc
index ac638fc9f9666f93cc15c7fdc5a15ee187d2714a..5253f42f739d98dc886b74d0202ff68e145460f8 100644 (file)
--- a/src/modified_gamma_transfer_function.cc
+++ b/src/modified_gamma_transfer_function.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "modified_gamma_transfer_function.h"

diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc
index 1a3656cc18d45d0fe32c797241c69316b5808f2f..9c4b02933f25112c43b5c94f93e3cb5022873047 100644 (file)
--- a/src/mono_picture_asset.cc
+++ b/src/mono_picture_asset.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "mono_picture_asset.h"

diff --git a/src/mono_picture_asset_reader.cc b/src/mono_picture_asset_reader.cc
index 68606f03f2fc87149fa688accd8d6bbd407a299f..2ddc7d322b3142ec8c46561b2982baa69ead41f5 100644 (file)
--- a/src/mono_picture_asset_reader.cc
+++ b/src/mono_picture_asset_reader.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "mono_picture_asset_reader.h"

diff --git a/src/mono_picture_asset_writer.cc b/src/mono_picture_asset_writer.cc
index 594dae0370ff753464d40f13f29c42dd1e0463e0..c1f539a0fd59e411c3446cf42c532753520fc157 100644 (file)
--- a/src/mono_picture_asset_writer.cc
+++ b/src/mono_picture_asset_writer.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/mono_picture_asset_writer.cc

diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc
index e870ff0fd7559fc454ce54876dd1dd09beb0ee52..f53dfa7bdcfa34e95e31140c8dc1338d5cb72260 100644 (file)
--- a/src/mono_picture_frame.cc
+++ b/src/mono_picture_frame.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/mono_picture_frame.cc

diff --git a/src/mxf.cc b/src/mxf.cc
index 67e63283d93903323fa138cfb7520ed92055210f..1da0927382d036a867c7dc33d1bc1634c3a15fbc 100644 (file)
--- a/src/mxf.cc
+++ b/src/mxf.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/asset.cc

diff --git a/src/object.cc b/src/object.cc
index f1e934159a4f1b785aebe5ccd20f15a78e4172d2..28f5552db7548abfbf63bd4354ff2aa0966a9534 100644 (file)
--- a/src/object.cc
+++ b/src/object.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/object.cc

diff --git a/src/openjpeg_image.cc b/src/openjpeg_image.cc
index 3f5e1dee90e964bd06ef9e0bf3f80f99b5245a97..faeeeb42924a091d9277cb4f88f97b5e2ca4a71b 100644 (file)
--- a/src/openjpeg_image.cc
+++ b/src/openjpeg_image.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/openjpeg_image.cc

diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index 89fe7dbff06f536e55795b2cb8cf69b6c76e7669..003628b35335d361115c2ccc83f8948b6ead15c9 100644 (file)
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "picture_asset.h"

diff --git a/src/picture_asset_writer.cc b/src/picture_asset_writer.cc
index 27878d18ebd765cf0c8f9cefe632c467ac4c2f3a..0d58826647ae70f9b819fcbf9bc2fb1f6906c664 100644 (file)
--- a/src/picture_asset_writer.cc
+++ b/src/picture_asset_writer.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "KM_fileio.h"

diff --git a/src/picture_asset_writer_common.cc b/src/picture_asset_writer_common.cc
index b59ca427d5ab69aaa7b57a8891288c75ec1cc1ef..88df661215274893a0c4f043e03fce839d8becc7 100644 (file)
--- a/src/picture_asset_writer_common.cc
+++ b/src/picture_asset_writer_common.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 using boost::shared_ptr;

diff --git a/src/reel.cc b/src/reel.cc
index 457803e4d8b180c426e8440c1397ef870c32d9b0..4db61e8830fa19152e4235c2f2e356340f5a8331 100644 (file)
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "reel.h"

diff --git a/src/reel_asset.cc b/src/reel_asset.cc
index 75e0f6f0da686b959853f418407c77398960d953..c2d9824c18bd56538e9717f600abb8ca6b23f8c4 100644 (file)
--- a/src/reel_asset.cc
+++ b/src/reel_asset.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/reel_asset.cc

diff --git a/src/reel_atmos_asset.cc b/src/reel_atmos_asset.cc
index 6c49ff299601397149e5a600e8825984bbcaf699..1b61a865a6cabf6b845bb04eb641387637213743 100644 (file)
--- a/src/reel_atmos_asset.cc
+++ b/src/reel_atmos_asset.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/reel_atmos_asset.cc

diff --git a/src/reel_mono_picture_asset.cc b/src/reel_mono_picture_asset.cc
index 702bc500535f7ef4c3608313d2b5381d9befce0a..f9404450911285a77e1215a8dcd24b1de9f1a13b 100644 (file)
--- a/src/reel_mono_picture_asset.cc
+++ b/src/reel_mono_picture_asset.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/reel_mono_picture_asset.cc

diff --git a/src/reel_mxf.cc b/src/reel_mxf.cc
index 425979813914e7b3b9fbde003886f194870e0edc..f5aa8b2877abfb42564e68b040b985e79318d84c 100644 (file)
--- a/src/reel_mxf.cc
+++ b/src/reel_mxf.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "reel_mxf.h"

diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc
index e8ee1d7e028c963b0a77fc632c51778071d31456..713ae0770c5d8de9be830443289c7ee95d35a463 100644 (file)
--- a/src/reel_picture_asset.cc
+++ b/src/reel_picture_asset.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/reel_picture_asset.h

diff --git a/src/reel_sound_asset.cc b/src/reel_sound_asset.cc
index 49116575f5d51139b19064f407bc713ef347c97e..6c9b0ceaf1ca89ab01025b032a906d2eda396da8 100644 (file)
--- a/src/reel_sound_asset.cc
+++ b/src/reel_sound_asset.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/reel_sound_asset.cc

diff --git a/src/reel_stereo_picture_asset.cc b/src/reel_stereo_picture_asset.cc
index 0c2062856cdc5e8989a59095e9d03b9e8739756d..06de8aa7c8b6890607ae7b668094b2827bf8bb0b 100644 (file)
--- a/src/reel_stereo_picture_asset.cc
+++ b/src/reel_stereo_picture_asset.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/reel_stereo_picture_asset.cc

diff --git a/src/reel_subtitle_asset.cc b/src/reel_subtitle_asset.cc
index acb96a3bb1e498e87ae1305618557172cc920833..1072dda10e8a63444e6532a59c1092d39092ee0a 100644 (file)
--- a/src/reel_subtitle_asset.cc
+++ b/src/reel_subtitle_asset.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/reel_subtitle_asset.cc

diff --git a/src/ref.cc b/src/ref.cc
index 43713b5780a0604cb5dcc92fcb05939aba74fb70..8b52f7e5643ab63052d8418c3ebeec445e3ea5f0 100644 (file)
--- a/src/ref.cc
+++ b/src/ref.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "ref.h"

diff --git a/src/rgb_xyz.cc b/src/rgb_xyz.cc
index 08616a64bb1b845288d1005562e0a3d82e45c22f..2627a9caa2b964106c8f25b7693844277e1971bd 100644 (file)
--- a/src/rgb_xyz.cc
+++ b/src/rgb_xyz.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "rgb_xyz.h"

diff --git a/src/smpte_load_font_node.cc b/src/smpte_load_font_node.cc
index 994c19dfda96cd08f4326c04cbfe7e5ca695fabb..91e5365836cd55c8b79cc6ad64de0acf2bfc0004 100644 (file)
--- a/src/smpte_load_font_node.cc
+++ b/src/smpte_load_font_node.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "smpte_load_font_node.h"

diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc
index ee1055660239354792a0208019b272b52819a27d..647e6cd12fa26a9bf37a220e34de29e781800f35 100644 (file)
--- a/src/smpte_subtitle_asset.cc
+++ b/src/smpte_subtitle_asset.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/smpte_subtitle_asset.cc

diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index ffafe46c316945bd5ffbca88b62f9ed9641b6627..e804cc9f17c6087109ff99cc5906f3c4c32fab3c 100644 (file)
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/sound_mxf.cc

diff --git a/src/sound_asset_reader.cc b/src/sound_asset_reader.cc
index 816f5addde6ec10c536aea1bcafa7499bda44040..b21b28a63745a178dccd947cf8fa5e1c633a1bbd 100644 (file)
--- a/src/sound_asset_reader.cc
+++ b/src/sound_asset_reader.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "sound_asset_reader.h"

diff --git a/src/sound_asset_writer.cc b/src/sound_asset_writer.cc
index 46321a857f9648dd30e285aa3f5fae86664010c6..25fcc4345d7d7df820ce1257838ea60400c3b653 100644 (file)
--- a/src/sound_asset_writer.cc
+++ b/src/sound_asset_writer.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "sound_asset_writer.h"

diff --git a/src/sound_frame.cc b/src/sound_frame.cc
index 540c3dfde039ea238cd76404c669e50978cd10a3..2fa2fc5ebe5e381a44b091a8cf413e4467ca49ac 100644 (file)
--- a/src/sound_frame.cc
+++ b/src/sound_frame.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/sound_frame.cc

diff --git a/src/stereo_picture_asset.cc b/src/stereo_picture_asset.cc
index c7e0575c2af6f7ab345c725b6283860abe34e3e4..c81b58776082ead4e0356b13bcdf6fbbfb0ee67a 100644 (file)
--- a/src/stereo_picture_asset.cc
+++ b/src/stereo_picture_asset.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "AS_DCP.h"

diff --git a/src/stereo_picture_asset_reader.cc b/src/stereo_picture_asset_reader.cc
index 95db4c2b18308a77697e6c645b10a95a5c30249a..fa06597eff78d7b2bce0715cc6f131a5bbfc36c1 100644 (file)
--- a/src/stereo_picture_asset_reader.cc
+++ b/src/stereo_picture_asset_reader.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "stereo_picture_asset_reader.h"

diff --git a/src/stereo_picture_asset_writer.cc b/src/stereo_picture_asset_writer.cc
index 8f7e1b7e3d445283abe1ab30b6ef2ac68312c304..7a20048f9f41c6ee331e38efdebfbf9a4a45897a 100644 (file)
--- a/src/stereo_picture_asset_writer.cc
+++ b/src/stereo_picture_asset_writer.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "stereo_picture_asset_writer.h"

diff --git a/src/stereo_picture_frame.cc b/src/stereo_picture_frame.cc
index c5b199abc06c4f0d4ed385b46d1880f99ee1cdf6..d00be2f9fa658bcbe4e02a8b7a7f6b7245bc408c 100644 (file)
--- a/src/stereo_picture_frame.cc
+++ b/src/stereo_picture_frame.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "stereo_picture_frame.h"

diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index 47baaa4eaed4a1e13dcbfb2d36af76a3b5f3e487..2576fed000e8fff4ed7c42d9d44b79cc72a34650 100644 (file)
--- a/src/subtitle_asset.cc
+++ b/src/subtitle_asset.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "raw_convert.h"

diff --git a/src/subtitle_node.cc b/src/subtitle_node.cc
index 520f00961530206fd31fdc508418f20151eb980e..41d1419be27342311190286e20a19904fabd5fcc 100644 (file)
--- a/src/subtitle_node.cc
+++ b/src/subtitle_node.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "subtitle_node.h"

diff --git a/src/subtitle_string.cc b/src/subtitle_string.cc
index 2f6f421b6da09f57f9a06286ee28a2f59438245f..2aadc9e9efbe9d258cd3a3cdcbe2142dfa1f4758 100644 (file)
--- a/src/subtitle_string.cc
+++ b/src/subtitle_string.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "subtitle_string.h"

diff --git a/src/text_node.cc b/src/text_node.cc
index ec7d12948e5a483692774a53a8ae58b57741c319..6317c59de4723290d23605e1d5d1b4d5c8f23243 100644 (file)
--- a/src/text_node.cc
+++ b/src/text_node.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/text.cc

diff --git a/src/transfer_function.cc b/src/transfer_function.cc
index 6765e8a03678049c442cf53cdc7aa2e45c30e90e..efa8e2bb99d96b1bf38326f0a77713cb29957eb5 100644 (file)
--- a/src/transfer_function.cc
+++ b/src/transfer_function.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "transfer_function.h"

diff --git a/src/types.cc b/src/types.cc
index 8103d04ec5a1a9761f9ab8bb00fbdf9a1782e823..03c69fabbeef54d21ec30454cad0a701bbdc9b76 100644 (file)
--- a/src/types.cc
+++ b/src/types.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 #include "raw_convert.h"

diff --git a/src/util.cc b/src/util.cc
index f61a5f38732e1f9c0c1e7908830e4f064dab1bc4..0cce78721e9dc15012e0fa86f2c6c6d45d6cf7c9 100644 (file)
--- a/src/util.cc
+++ b/src/util.cc
@@ -15,7 +15,6 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
 */
 
 /** @file  src/util.cc

diff --git a/test/asset_test.cc b/test/asset_test.cc
index caf5e76c48e8428f4d2c94ba36ba33c1a8bcec48..688f19feb6adc67006bcc6a7574f8f784fa9d55d 100644 (file)
--- a/test/asset_test.cc
+++ b/test/asset_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <boost/test/unit_test.hpp>

diff --git a/test/atmos_test.cc b/test/atmos_test.cc
index b4c2762640e9ba7da3814f7bc148ac598564a9fa..6a7e9771c84670a80ed665b2b6c357bc453a0bc6 100644 (file)
--- a/test/atmos_test.cc
+++ b/test/atmos_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "atmos_asset.h"

diff --git a/test/bench.cc b/test/bench.cc
index 44d1b6de91b543997eeb25a397bdf7af7d6266fd..bb583e39d33d500653bc7ce0dddbd469578c4dbb 100644 (file)
--- a/test/bench.cc
+++ b/test/bench.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "data.h"

diff --git a/test/certificates_test.cc b/test/certificates_test.cc
index 9be2e7facf1847825a21c4bb129f7777c2015c7c..879a89dda6535069214889bfea258b66b489ef30 100644 (file)
--- a/test/certificates_test.cc
+++ b/test/certificates_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "certificate.h"

diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc
index d9bf2e77bbd116c8fff4bf556ff57a75f1435778..5b217e3ce1a32dbd333673ff2dc7deb4e467a10d 100644 (file)
--- a/test/colour_conversion_test.cc
+++ b/test/colour_conversion_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "gamma_transfer_function.h"

diff --git a/test/colour_test.cc b/test/colour_test.cc
index 7169c1771075995a3d555666e13e62619363c0c1..a99b5b7ef4ab701ec9bcc5f5b0b5d558edfbf566 100644 (file)
--- a/test/colour_test.cc
+++ b/test/colour_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "util.h"

diff --git a/test/cpl_sar_test.cc b/test/cpl_sar_test.cc
index 095920ece4d0403e78e9ca3456414213197d6471..55c3bcdc477019f4a7b458b902bf3f9fbe020e60 100644 (file)
--- a/test/cpl_sar_test.cc
+++ b/test/cpl_sar_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "cpl.h"

diff --git a/test/dcp_font_test.cc b/test/dcp_font_test.cc
index 9a482f0986084718062e3152f642f19ba0085667..d7300ba09e03d9256049a8b83ccab9b804a52af9 100644 (file)
--- a/test/dcp_font_test.cc
+++ b/test/dcp_font_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "interop_subtitle_asset.h"

diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index 6769c496b74ec85b7820e9b0a2c3e9daf15fc413..325202f020c7f61c6e0b8d06e2c5b0a23d81abb6 100644 (file)
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "dcp.h"

diff --git a/test/dcp_time_test.cc b/test/dcp_time_test.cc
index 61b38ec4981e51e89b24dfd1b0ce2abbf1a3dc72..9cd253c13248a6aa87c45a15d2caa6cfea2393a0 100644 (file)
--- a/test/dcp_time_test.cc
+++ b/test/dcp_time_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <boost/test/unit_test.hpp>

diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index 1496a0d5ebae80454b1d182e9c8dc779296bb3b0..32ea7cdac0a1852dd62d838aea34989ff6f7c4ef 100644 (file)
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "dcp.h"

diff --git a/test/effect_test.cc b/test/effect_test.cc
index cd1a6c3cbea110439cf2753f67954f3101f770b3..5e1740b14e73a7dee1becbbb8b7d7ca5bf306688 100644 (file)
--- a/test/effect_test.cc
+++ b/test/effect_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "types.h"

diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 49e0575341d69ea1f4d8c218780a99b9891f5b48..24bd1138a445bb1c3f3ace7d28cc3daf7b0fcac1 100644 (file)
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "KM_util.h"

diff --git a/test/exception_test.cc b/test/exception_test.cc
index dd9608ee9b6dc7f3a32cd37dba9904897630a2eb..e879244d3ff7e4da8c3b3df5a246814352929c67 100644 (file)
--- a/test/exception_test.cc
+++ b/test/exception_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "exceptions.h"

diff --git a/test/fraction_test.cc b/test/fraction_test.cc
index efdba664fe6469f9ab8ee68736d7aef84d5db320..7c892a56ef4006f95441d6ad2d86c1ab15bf0b9b 100644 (file)
--- a/test/fraction_test.cc
+++ b/test/fraction_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "types.h"

diff --git a/test/gamma_transfer_function_test.cc b/test/gamma_transfer_function_test.cc
index 9e0ea089b8ce2bc11f72cd3aea8a25e9690eb62d..827b3a8009b021ab0635d4f1b773de5b91c718ad 100644 (file)
--- a/test/gamma_transfer_function_test.cc
+++ b/test/gamma_transfer_function_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "gamma_transfer_function.h"

diff --git a/test/interop_load_font_test.cc b/test/interop_load_font_test.cc
index 04520080696782836770a507e730a7eb64755a8c..888c2355ad696b9f2b26e9b3b964180173490f7b 100644 (file)
--- a/test/interop_load_font_test.cc
+++ b/test/interop_load_font_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "interop_load_font_node.h"

diff --git a/test/kdm_test.cc b/test/kdm_test.cc
index d6d4a2b6bee1491bbd96d2a8f06072c8944d3254..ee52ad8ebc207ce0c0f859385aa3a2b1db6d6c13 100644 (file)
--- a/test/kdm_test.cc
+++ b/test/kdm_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <boost/test/unit_test.hpp>

diff --git a/test/local_time_test.cc b/test/local_time_test.cc
index 4cd7915811417ff747ba261210611a95433505f1..83e9ba7f973d601bd8d7911e3fe03d0beb2f818b 100644 (file)
--- a/test/local_time_test.cc
+++ b/test/local_time_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <boost/test/unit_test.hpp>

diff --git a/test/make_digest_test.cc b/test/make_digest_test.cc
index b7e18a127f2be5987d580e2eefb5a371ebca98f1..65ca754d53931ee654ff22ee349198786da3097c 100644 (file)
--- a/test/make_digest_test.cc
+++ b/test/make_digest_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "data.h"

diff --git a/test/read_dcp_test.cc b/test/read_dcp_test.cc
index 60aa3591ef4ecec2d5984f37c2efffac40986d3c..0ec72bdc9c053933429fe957ffd9ba1b75ade8b0 100644 (file)
--- a/test/read_dcp_test.cc
+++ b/test/read_dcp_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <boost/test/unit_test.hpp>

diff --git a/test/read_interop_subtitle_test.cc b/test/read_interop_subtitle_test.cc
index 8640b7ef2892bfe6528b8f4468abac3826e46c61..3ec70296768ba7aa6e3505d0bf1d29daa33b9a37 100644 (file)
--- a/test/read_interop_subtitle_test.cc
+++ b/test/read_interop_subtitle_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "interop_subtitle_asset.h"

diff --git a/test/read_smpte_subtitle_test.cc b/test/read_smpte_subtitle_test.cc
index f4d2810637d86717825f9251ec22d9daa12fe987..801d58cd400c13007e0286693ce36a048888cffa 100644 (file)
--- a/test/read_smpte_subtitle_test.cc
+++ b/test/read_smpte_subtitle_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "smpte_subtitle_asset.h"

diff --git a/test/recovery_test.cc b/test/recovery_test.cc
index 85b0d0f9722966c29bd30c4bde489357f17106d5..8af49b93a249be943d25f023c6aa70f7f2687e67 100644 (file)
--- a/test/recovery_test.cc
+++ b/test/recovery_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <boost/test/unit_test.hpp>

diff --git a/test/reel_asset_test.cc b/test/reel_asset_test.cc
index bdbd68ea91473d09e45a028035cffe9743e1a41f..770a4c8f3123a6637c5f742c8be11a4c78a29d84 100644 (file)
--- a/test/reel_asset_test.cc
+++ b/test/reel_asset_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "reel_mono_picture_asset.h"

diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc
index f31656017daa4d142eda03d3baa2de63833bf3cb..ba27d1902a39a8c6011dff4988e4faf4dc1c46ae 100644 (file)
--- a/test/rewrite_subs.cc
+++ b/test/rewrite_subs.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <iostream>

diff --git a/test/rgb_xyz_test.cc b/test/rgb_xyz_test.cc
index 8f5698fe7a679f12a5498b7a498779258fa89927..cf42957b2597868cf07db129822af742bb79a2d3 100644 (file)
--- a/test/rgb_xyz_test.cc
+++ b/test/rgb_xyz_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "rgb_xyz.h"

diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index e735a2764c765c4b9fc7cd2080ce51985539964a..f149c5f14e23e25cb0784d92da63d4229c3e6b91 100644 (file)
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "certificate.h"

diff --git a/test/smpte_load_font_test.cc b/test/smpte_load_font_test.cc
index da52ed973737b5196ab28c4654acde2d7a1ac2d1..fa9e3bd59f03737954382a4c0387ef2fba256187 100644 (file)
--- a/test/smpte_load_font_test.cc
+++ b/test/smpte_load_font_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "smpte_load_font_node.h"

diff --git a/test/sound_frame_test.cc b/test/sound_frame_test.cc
index 837cfe32f5f2cdda3d36f00711b9b979d1218d5d..86b7d845a2bbcacd6889d016b1591452981cb5ba 100644 (file)
--- a/test/sound_frame_test.cc
+++ b/test/sound_frame_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <boost/test/unit_test.hpp>

diff --git a/test/subs_in_out.cc b/test/subs_in_out.cc
index 154eb9e8247c4e080a66fb4d0bc2a5b3f8cc9013..d3ba7e4311675720a5f98079a82ddd904ca347d5 100644 (file)
--- a/test/subs_in_out.cc
+++ b/test/subs_in_out.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "interop_subtitle_asset.h"

diff --git a/test/test.cc b/test/test.cc
index 38e9c00ebbcc0623d013cdcc0d1b111c5e1885d7..0e7ad51178e356c638facd773bed9230794c095c 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #define BOOST_TEST_DYN_LINK

diff --git a/test/test.h b/test/test.h
index d9860687226028bdfeec3abfb8c4d03ec580b1b5..21df1ab52dab2160da1c2ff7e213904f66aeb89d 100644 (file)
--- a/test/test.h
+++ b/test/test.h
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <boost/filesystem.hpp>

diff --git a/test/text_test.cc b/test/text_test.cc
index 9fff25d6a9101eff13de31290c34bc58f50b1ae4..23a3ae77381501f2deb14c6c4e5c95ce070de68f 100644 (file)
--- a/test/text_test.cc
+++ b/test/text_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "text_node.h"

diff --git a/test/util_test.cc b/test/util_test.cc
index eea1c799ba731b6816f544feaf64e055dbb949ba..f95001b4a46f3839840679ad7100ec49230ac9f9 100644 (file)
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <fstream>

diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc
index ffd01e1f77a7394a218e2d4e89756062aff41da2..648d5928272d19a441081d9220c7e30bb77ff8e4 100644 (file)
--- a/test/write_subtitle_test.cc
+++ b/test/write_subtitle_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "interop_subtitle_asset.h"

diff --git a/tools/common.cc b/tools/common.cc
index 5730848cc2b2252420e7f870ceee95d96025a25c..aaa07fb2c6868fd46a66462c106c751c0091fa43 100644 (file)
--- a/tools/common.cc
+++ b/tools/common.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "common.h"

diff --git a/tools/common.h b/tools/common.h
index a9c657ce9abd70a107a97c52eac4ae447021485e..cea183db7c6dbcac402a3e39631674da198ebe4c 100644 (file)
--- a/tools/common.h
+++ b/tools/common.h
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "exceptions.h"

diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc
index 6fb2317bd8b009709afd891cc35e45838964bfc8..d5bb3f929f83d5a3a68f0a2eb131ac204bdb6775 100644 (file)
--- a/tools/dcpdiff.cc
+++ b/tools/dcpdiff.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "dcp.h"

diff --git a/tools/dcpdumpsub.cc b/tools/dcpdumpsub.cc
index ca98551b742550b5f42b11dc706801415ef0c491..6cb641e4e0cb97036d075cae2ad199de4d7c8962 100644 (file)
--- a/tools/dcpdumpsub.cc
+++ b/tools/dcpdumpsub.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "smpte_subtitle_asset.h"

diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc
index e15c164bfececeea3658deda0803d9fed4d01661..7bb5f1b3b83f98316db8a2a8213ed6538eeeb795 100644 (file)
--- a/tools/dcpinfo.cc
+++ b/tools/dcpinfo.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "dcp.h"