X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcolour_conversion.h;h=bf883a07c32413f3bd28071ee287882ea6cc0a08;hb=6154d5f85664a26e9490c9120bef5e742af94490;hp=fa1a955e1e414806fe84453657e3b09c6c49a03b;hpb=d324fc102df00d6dc62614938f78cf983a101dd4;p=dcpomatic.git

diff --git a/src/lib/colour_conversion.h b/src/lib/colour_conversion.h
index fa1a955e1..bf883a07c 100644
--- a/src/lib/colour_conversion.h
+++ b/src/lib/colour_conversion.h
@@ -25,20 +25,19 @@
 #undef check
 #endif
 
-#include <boost/utility.hpp>
-#include <boost/optional.hpp>
-#include <boost/numeric/ublas/matrix.hpp>
+#include <dcp/colour_conversion.h>
 #include <libcxml/cxml.h>
+#include <boost/utility.hpp>
 
 namespace xmlpp {
 	class Node;
 }
 
-class ColourConversion
+class ColourConversion : public dcp::ColourConversion
 {
 public:
 	ColourConversion ();
-	ColourConversion (double, bool, double const matrix[3][3], double);
+	ColourConversion (dcp::ColourConversion);
 	ColourConversion (cxml::NodePtr);
 
 	virtual void as_xml (xmlpp::Node *) const;
@@ -46,17 +45,14 @@ public:
 
 	boost::optional<size_t> preset () const;
 
-	double input_gamma;
-	bool input_gamma_linearised;
-	boost::numeric::ublas::matrix<double> matrix;
-	double output_gamma;
+	static boost::optional<ColourConversion> from_xml (cxml::NodePtr);
 };
 
 class PresetColourConversion
 {
 public:
 	PresetColourConversion ();
-	PresetColourConversion (std::string, double, bool, double const matrix[3][3], double);
+	PresetColourConversion (std::string, dcp::ColourConversion);
 	PresetColourConversion (cxml::NodePtr);
 
 	void as_xml (xmlpp::Node *) const;