Fix equals() with image subtitles to not compare unique IDs.

[libdcp.git] / src / colour_conversion.h

diff --git a/src/colour_conversion.h b/src/colour_conversion.h
index 8940e4865cbc17bffb6879aecce4a24530674e48..c6f6f5296fa2447aed168079cff93cff21e808e2 100644 (file)
--- a/src/colour_conversion.h
+++ b/src/colour_conversion.h
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     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
@@ -26,6 +40,9 @@
 
 #include "chromaticity.h"
 #include <boost/shared_ptr.hpp>
+#if BOOST_VERSION >= 106400
+#include <boost/serialization/array_wrapper.hpp>
+#endif
 #include <boost/numeric/ublas/matrix.hpp>
 #include <boost/optional.hpp>
 
@@ -141,6 +158,7 @@ public:
        static ColourConversion const & p3_to_xyz ();
        static ColourConversion const & rec1886_to_xyz ();
        static ColourConversion const & rec2020_to_xyz ();
+       static ColourConversion const & s_gamut3_to_xyz ();
 
 protected:
        /** Input transfer function (probably a gamma function, or something similar) */