X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcolour_conversion.cc;h=aacefaa05502c9202178b2637dfa7dd5dbd50df6;hb=a5139de256c287459e04c75712614b2e7246a89a;hp=96dc0e2c91bbca1284b3f50a27193aef4534f49c;hpb=74a8d26a8907c6e00e29f054178a3425f44e38ed;p=dcpomatic.git

diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index 96dc0e2c9..aacefaa05 100644
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -17,36 +17,41 @@
 
 */
 
-#include <boost/lexical_cast.hpp>
 #include <libxml++/libxml++.h>
-#include <libdcp/colour_matrix.h>
+#include <dcp/colour_matrix.h>
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
+#include "config.h"
 #include "colour_conversion.h"
+#include "util.h"
+#include "md5_digester.h"
 
 #include "i18n.h"
 
 using std::list;
 using std::string;
+using std::stringstream;
+using std::cout;
+using std::vector;
 using boost::shared_ptr;
-using boost::lexical_cast;
+using boost::optional;
+using dcp::raw_convert;
 
 ColourConversion::ColourConversion ()
-	: name (_("Untitled"))
-	, input_gamma (2.4)
+	: input_gamma (2.4)
 	, input_gamma_linearised (true)
 	, matrix (3, 3)
 	, output_gamma (2.6)
 {
 	for (int i = 0; i < 3; ++i) {
 		for (int j = 0; j < 3; ++j) {
-			matrix (i, j) = libdcp::colour_matrix::xyz_to_rgb[i][j];
+			matrix (i, j) = dcp::colour_matrix::srgb_to_xyz[i][j];
 		}
 	}
 }
 
-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)
@@ -58,11 +63,10 @@ ColourConversion::ColourConversion (string n, float i, bool il, float const m[3]
 	}
 }
 
-ColourConversion::ColourConversion (shared_ptr<cxml::Node> node)
+ColourConversion::ColourConversion (cxml::NodePtr 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) {
@@ -71,31 +75,123 @@ ColourConversion::ColourConversion (shared_ptr<cxml::Node> node)
 		}
 	}
 
-	list<shared_ptr<cxml::Node> > m = node->node_children ("Matrix");
-	for (list<shared_ptr<cxml::Node> >::iterator i = m.begin(); i != m.end(); ++i) {
+	list<cxml::NodePtr> m = node->node_children ("Matrix");
+	for (list<cxml::NodePtr>::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) = raw_convert<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("InputGamma")->add_child_text (raw_convert<string> (input_gamma));
 	node->add_child("InputGammaLinearised")->add_child_text (input_gamma_linearised ? "1" : "0");
 
 	for (int i = 0; i < 3; ++i) {
 		for (int j = 0; j < 3; ++j) {
 			xmlpp::Element* m = node->add_child("Matrix");
-			m->set_attribute ("i", lexical_cast<string> (i));
-			m->set_attribute ("j", lexical_cast<string> (j));
-			m->add_child_text (lexical_cast<string> (matrix (i, j)));
+			m->set_attribute ("i", raw_convert<string> (i));
+			m->set_attribute ("j", raw_convert<string> (j));
+			m->add_child_text (raw_convert<string> (matrix (i, j)));
 		}
 	}
 
-	node->add_child("OutputGamma")->add_child_text (lexical_cast<string> (output_gamma));
+	node->add_child("OutputGamma")->add_child_text (raw_convert<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;
+}
+
+string
+ColourConversion::identifier () const
+{
+	MD5Digester digester;
+	
+	digester.add (input_gamma);
+	digester.add (input_gamma_linearised);
+	for (int i = 0; i < 3; ++i) {
+		for (int j = 0; j < 3; ++j) {
+			digester.add (matrix (i, j));
+		}
+	}
+	digester.add (output_gamma);
+	
+	return digester.get ();
+}
+
+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 (cxml::NodePtr 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);
 }