#undef check
#endif
+#include <dcp/colour_conversion.h>
#include <libcxml/cxml.h>
#include <boost/utility.hpp>
-#include <boost/optional.hpp>
-#include <boost/numeric/ublas/matrix.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 &);
bool operator!= (ColourConversion const &, ColourConversion const &);
+bool operator== (PresetColourConversion const &, PresetColourConversion const &);
#endif