Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

[dcpomatic.git] / src / lib / colour_conversion.h

diff --git a/src/lib/colour_conversion.h b/src/lib/colour_conversion.h
index 706e51fe8cd60ef1f731024d179989f922d5cd19..47e6d2b6f873670eb2b0b52fa325f24bcf6c097a 100644 (file)
--- a/src/lib/colour_conversion.h
+++ b/src/lib/colour_conversion.h
@@ -25,46 +25,40 @@
 #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 (cxml::NodePtr);
+       ColourConversion (dcp::ColourConversion);
+       ColourConversion (cxml::NodePtr, int version);
 
        virtual void as_xml (xmlpp::Node *) const;
        std::string identifier () const;
 
        boost::optional<size_t> preset () const;
 
-       static boost::optional<ColourConversion> from_xml (cxml::NodePtr);
-
-       double input_gamma;
-       bool input_gamma_linearised;
-       boost::numeric::ublas::matrix<double> matrix;
-       double output_gamma;
+       static boost::optional<ColourConversion> from_xml (cxml::NodePtr, int version);
 };
 
 class PresetColourConversion
 {
 public:
        PresetColourConversion ();
-       PresetColourConversion (std::string, double, bool, double const matrix[3][3], double);
-       PresetColourConversion (cxml::NodePtr);
+       PresetColourConversion (std::string, dcp::ColourConversion);
+       PresetColourConversion (cxml::NodePtr node, int version);
 
        void as_xml (xmlpp::Node *) const;
 
-       std::string name;
        ColourConversion conversion;
+       std::string name;
 };
 
 bool operator== (ColourConversion const &, ColourConversion const &);