X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fcpl.h;h=4219c523268d6326fc6d0aceba6bcb7ed5fbe685;hb=7e9ad089942bc3f1f9b461c87203b515c6d4a237;hp=5ff320d2d8bf844366f8abbfa43ea9e5e1003ef7;hpb=437f928f7d7209c9e4c8ea3e3b5d0e8dc43b54a8;p=libdcp.git

diff --git a/src/cpl.h b/src/cpl.h
index 5ff320d2..4219c523 100644
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -1,20 +1,34 @@
 /*
     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/>.
+
+    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/cpl.h
@@ -51,7 +65,7 @@ class CPL : public Asset
 {
 public:
 	CPL (std::string annotation_text, ContentKind content_kind);
-	CPL (boost::filesystem::path file);
+	explicit CPL (boost::filesystem::path file);
 
 	bool equals (
 		boost::shared_ptr<const Asset> other,