summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/asset.cc1
-rw-r--r--src/asset_reader.cc1
-rw-r--r--src/asset_writer.cc1
-rw-r--r--src/atmos_asset.cc1
-rw-r--r--src/certificate.cc1
-rw-r--r--src/certificate_chain.cc1
-rw-r--r--src/colour_conversion.cc1
-rw-r--r--src/colour_matrix.cc1
-rw-r--r--src/cpl.cc1
-rw-r--r--src/data.cc1
-rw-r--r--src/dcp.cc1
-rw-r--r--src/dcp_time.cc1
-rw-r--r--src/decrypted_kdm.cc1
-rw-r--r--src/decrypted_kdm_key.cc1
-rw-r--r--src/encrypted_kdm.cc1
-rw-r--r--src/exceptions.cc1
-rw-r--r--src/file.cc1
-rw-r--r--src/font_asset.cc1
-rw-r--r--src/font_node.cc1
-rw-r--r--src/gamma_transfer_function.cc1
-rw-r--r--src/interop_load_font_node.cc1
-rw-r--r--src/interop_subtitle_asset.cc1
-rw-r--r--src/j2k.cc1
-rw-r--r--src/key.cc1
-rw-r--r--src/local_time.cc1
-rw-r--r--src/metadata.cc1
-rw-r--r--src/modified_gamma_transfer_function.cc1
-rw-r--r--src/mono_picture_asset.cc1
-rw-r--r--src/mono_picture_asset_reader.cc10
-rw-r--r--src/mono_picture_asset_writer.cc1
-rw-r--r--src/mono_picture_frame.cc1
-rw-r--r--src/mxf.cc1
-rw-r--r--src/object.cc1
-rw-r--r--src/openjpeg_image.cc1
-rw-r--r--src/picture_asset.cc1
-rw-r--r--src/picture_asset_writer.cc1
-rw-r--r--src/picture_asset_writer_common.cc1
-rw-r--r--src/reel.cc1
-rw-r--r--src/reel_asset.cc1
-rw-r--r--src/reel_atmos_asset.cc1
-rw-r--r--src/reel_mono_picture_asset.cc1
-rw-r--r--src/reel_mxf.cc1
-rw-r--r--src/reel_picture_asset.cc1
-rw-r--r--src/reel_sound_asset.cc1
-rw-r--r--src/reel_stereo_picture_asset.cc1
-rw-r--r--src/reel_subtitle_asset.cc1
-rw-r--r--src/ref.cc1
-rw-r--r--src/rgb_xyz.cc1
-rw-r--r--src/smpte_load_font_node.cc1
-rw-r--r--src/smpte_subtitle_asset.cc1
-rw-r--r--src/sound_asset.cc1
-rw-r--r--src/sound_asset_reader.cc10
-rw-r--r--src/sound_asset_writer.cc1
-rw-r--r--src/sound_frame.cc1
-rw-r--r--src/stereo_picture_asset.cc1
-rw-r--r--src/stereo_picture_asset_reader.cc10
-rw-r--r--src/stereo_picture_asset_writer.cc1
-rw-r--r--src/stereo_picture_frame.cc1
-rw-r--r--src/subtitle_asset.cc1
-rw-r--r--src/subtitle_node.cc1
-rw-r--r--src/subtitle_string.cc1
-rw-r--r--src/text_node.cc1
-rw-r--r--src/transfer_function.cc1
-rw-r--r--src/types.cc1
-rw-r--r--src/util.cc1
65 files changed, 15 insertions, 77 deletions
diff --git a/src/asset.cc b/src/asset.cc
index 82ef44fe..8753528b 100644
--- 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 a78af4d3..8fddcda2 100644
--- 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 64ffee10..06c47630 100644
--- 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 e503b7c1..48774038 100644
--- 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 7d80e300..c8e4e342 100644
--- 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 e12b1e75..557c8d37 100644
--- 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 04589cf4..7e4558be 100644
--- 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 227535e7..e7a992c8 100644
--- 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 8faf49bc..38f22d94 100644
--- 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 832416d4..87c4c160 100644
--- 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 d1520586..bb4a7128 100644
--- 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 2852a1eb..170d7398 100644
--- 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 7177892a..019783e0 100644
--- 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 95bdb41e..b7b30802 100644
--- 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 85c1f0d8..61460b12 100644
--- 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 258e6ff0..4bffd957 100644
--- 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 5f07c02c..3408f157 100644
--- 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 743aade6..43bedce1 100644
--- 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 c10721a2..d16997c9 100644
--- 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 a9763545..55f77302 100644
--- 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 d5a8151d..439fe453 100644
--- 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 4e66a329..97aa1a2c 100644
--- 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 c84c738e..27f2b66c 100644
--- 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 e7f34c04..3cf785ec 100644
--- 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 fa810a92..66579dfb 100644
--- 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 ec5ae359..130abffe 100644
--- 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 ac638fc9..5253f42f 100644
--- 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 1a3656cc..9c4b0293 100644
--- 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 68606f03..2ddc7d32 100644
--- 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 594dae03..c1f539a0 100644
--- 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 e870ff0f..f53dfa7b 100644
--- 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 67e63283..1da09273 100644
--- 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 f1e93415..28f5552d 100644
--- 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 3f5e1dee..faeeeb42 100644
--- 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 89fe7dbf..003628b3 100644
--- 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 27878d18..0d588266 100644
--- 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 b59ca427..88df6612 100644
--- 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 457803e4..4db61e88 100644
--- 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 75e0f6f0..c2d9824c 100644
--- 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 6c49ff29..1b61a865 100644
--- 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 702bc500..f9404450 100644
--- 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 42597981..f5aa8b28 100644
--- 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 e8ee1d7e..713ae077 100644
--- 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 49116575..6c9b0cea 100644
--- 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 0c206285..06de8aa7 100644
--- 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 acb96a3b..1072dda1 100644
--- 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 43713b57..8b52f7e5 100644
--- 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 08616a64..2627a9ca 100644
--- 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 994c19df..91e53658 100644
--- 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 ee105566..647e6cd1 100644
--- 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 ffafe46c..e804cc9f 100644
--- 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 816f5add..b21b28a6 100644
--- 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 46321a85..25fcc434 100644
--- 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 540c3dfd..2fa2fc5e 100644
--- 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 c7e0575c..c81b5877 100644
--- 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 95db4c2b..fa06597e 100644
--- 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 8f7e1b7e..7a20048f 100644
--- 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 c5b199ab..d00be2f9 100644
--- 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 47baaa4e..2576fed0 100644
--- 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 520f0096..41d1419b 100644
--- 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 2f6f421b..2aadc9e9 100644
--- 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 ec7d1294..6317c59d 100644
--- 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 6765e8a0..efa8e2bb 100644
--- 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 8103d04e..03c69fab 100644
--- 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 f61a5f38..0cce7872 100644
--- 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