X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_picture_asset.h;h=a20c216f0abb9f4dedc5293d29eb229264a25f8b;hb=f380b960018e5b81b6a10834822fa962bfab2c7b;hp=1611221fc32a777be7f0a174e91aa6a46aedeff0;hpb=1bcf0b11634647a2a6b99330b2854704e5c1bc38;p=libdcp.git

diff --git a/src/reel_picture_asset.h b/src/reel_picture_asset.h
index 1611221f..a20c216f 100644
--- a/src/reel_picture_asset.h
+++ b/src/reel_picture_asset.h
@@ -1,20 +1,34 @@
 /*
     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/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/reel_picture_asset.h
@@ -38,9 +52,9 @@ class ReelPictureAsset : public ReelAsset, public ReelMXF
 public:
 	ReelPictureAsset ();
 	ReelPictureAsset (boost::shared_ptr<PictureAsset> asset, int64_t entry_point);
-	ReelPictureAsset (boost::shared_ptr<const cxml::Node>);
+	explicit ReelPictureAsset (boost::shared_ptr<const cxml::Node>);
 
-	virtual void write_to_cpl (xmlpp::Node* node, Standard standard) const;
+	virtual xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) const;
 	virtual bool equals (boost::shared_ptr<const ReelAsset>, EqualityOptions, NoteHandler) const;
 
 	/** @return the PictureAsset that this object refers to */