Add OpenSSL licence exception.

[libdcp.git] / src / colour_conversion.h

diff --git a/src/colour_conversion.h b/src/colour_conversion.h
index 1f824c81329f22e4e72fa95edd627f2f129d520d..9b88a853a9348f5c534caeedde65120a53d457a0 100644 (file)
--- a/src/colour_conversion.h
+++ b/src/colour_conversion.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/colour_conversion.h
@@ -47,8 +61,9 @@ class ColourConversion
 {
 public:
        ColourConversion ()
+               : _yuv_to_rgb (YUV_TO_RGB_REC601)
        {}
-       
+
        ColourConversion (
                boost::shared_ptr<const TransferFunction> in,
                YUVToRGB yuv_to_rgb,
@@ -87,7 +102,7 @@ public:
        boost::optional<Chromaticity> adjusted_white () const {
                return _adjusted_white;
        }
-       
+
        boost::shared_ptr<const TransferFunction> out () const {
                return _out;
        }
@@ -123,7 +138,7 @@ public:
        void unset_adjusted_white () {
                _adjusted_white = boost::optional<Chromaticity> ();
        }
-       
+
        void set_out (boost::shared_ptr<const TransferFunction> f) {
                _out = f;
        }
@@ -138,6 +153,8 @@ public:
        static ColourConversion const & rec601_to_xyz ();
        static ColourConversion const & rec709_to_xyz ();
        static ColourConversion const & p3_to_xyz ();
+       static ColourConversion const & rec1886_to_xyz ();
+       static ColourConversion const & rec2020_to_xyz ();
 
 protected:
        /** Input transfer function (probably a gamma function, or something similar) */