Various bits mostly related to colour conversions.

1 files changed, 86 insertions, 10 deletions

diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index 96dc0e2c9..cc25ccc67 100644
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -21,18 +21,21 @@
 #include <libxml++/libxml++.h>
 #include <libdcp/colour_matrix.h>
 #include <libcxml/cxml.h>
+#include "config.h"
 #include "colour_conversion.h"
 
 #include "i18n.h"
 
 using std::list;
 using std::string;
+using std::cout;
+using std::vector;
 using boost::shared_ptr;
 using boost::lexical_cast;
+using boost::optional;
 
 ColourConversion::ColourConversion ()
-	: name (_("Untitled"))
-	, input_gamma (2.4)
+	: input_gamma (2.4)
 	, input_gamma_linearised (true)
 	, matrix (3, 3)
 	, output_gamma (2.6)
@@ -44,9 +47,8 @@ ColourConversion::ColourConversion ()
 	}
 }
 
-ColourConversion::ColourConversion (string n, float i, bool il, float const m[3][3], float o)
-	: name (n)
-	, input_gamma (i)
+ColourConversion::ColourConversion (double i, bool il, double const m[3][3], double o)
+	: input_gamma (i)
 	, input_gamma_linearised (il)
 	, matrix (3, 3)
 	, output_gamma (o)
@@ -61,8 +63,7 @@ ColourConversion::ColourConversion (string n, float i, bool il, float const m[3]
 ColourConversion::ColourConversion (shared_ptr<cxml::Node> node)
 	: matrix (3, 3)
 {
-	name = node->string_child ("Name");
-	input_gamma = node->number_child<float> ("InputGamma");
+	input_gamma = node->number_child<double> ("InputGamma");
 	input_gamma_linearised = node->bool_child ("InputGammaLinearised");
 
 	for (int i = 0; i < 3; ++i) {
@@ -75,16 +76,15 @@ ColourConversion::ColourConversion (shared_ptr<cxml::Node> node)
 	for (list<shared_ptr<cxml::Node> >::iterator i = m.begin(); i != m.end(); ++i) {
 		int const ti = (*i)->number_attribute<int> ("i");
 		int const tj = (*i)->number_attribute<int> ("j");
-		matrix(ti, tj) = lexical_cast<float> ((*i)->content ());
+		matrix(ti, tj) = lexical_cast<double> ((*i)->content ());
 	}
 
-	output_gamma = node->number_child<float> ("OutputGamma");
+	output_gamma = node->number_child<double> ("OutputGamma");
 }
 
 void
 ColourConversion::as_xml (xmlpp::Node* node) const
 {
-	node->add_child("Name")->add_child_text (name);
 	node->add_child("InputGamma")->add_child_text (lexical_cast<string> (input_gamma));
 	node->add_child("InputGammaLinearised")->add_child_text (input_gamma_linearised ? "1" : "0");
 
@@ -99,3 +99,79 @@ ColourConversion::as_xml (xmlpp::Node* node) const
 
 	node->add_child("OutputGamma")->add_child_text (lexical_cast<string> (output_gamma));
 }
+
+optional<size_t>
+ColourConversion::preset () const
+{
+	vector<PresetColourConversion> presets = Config::instance()->colour_conversions ();
+	size_t i = 0;
+	while (i < presets.size() && (presets[i].conversion != *this)) {
+		++i;
+	}
+
+	if (i >= presets.size ()) {
+		return optional<size_t> ();
+	}
+
+	return i;
+}
+
+PresetColourConversion::PresetColourConversion ()
+	: name (_("Untitled"))
+{
+
+}
+
+PresetColourConversion::PresetColourConversion (string n, double i, bool il, double const m[3][3], double o)
+	: name (n)
+	, conversion (i, il, m, o)
+{
+
+}
+
+PresetColourConversion::PresetColourConversion (shared_ptr<cxml::Node> node)
+	: conversion (node)
+{
+	name = node->string_child ("Name");
+}
+
+void
+PresetColourConversion::as_xml (xmlpp::Node* node) const
+{
+	conversion.as_xml (node);
+	node->add_child("Name")->add_child_text (name);
+}
+
+static bool
+about_equal (double a, double b)
+{
+	static const double eps = 1e-6;
+	return fabs (a - b) < eps;
+}
+
+bool
+operator== (ColourConversion const & a, ColourConversion const & b)
+{
+	if (
+		!about_equal (a.input_gamma, b.input_gamma) ||
+		a.input_gamma_linearised != b.input_gamma_linearised ||
+		!about_equal (a.output_gamma, b.output_gamma)) {
+		return false;
+	}
+
+	for (int i = 0; i < 3; ++i) {
+		for (int j = 0; j < 3; ++j) {
+			if (!about_equal (a.matrix (i, j), b.matrix (i, j))) {
+				return false;
+			}
+		}
+	}
+
+	return true;
+}
+
+bool
+operator!= (ColourConversion const & a, ColourConversion const & b)
+{
+	return !(a == b);
+}