Merge master.

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

diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index cc25ccc67fce6bba6f71fcc0f944c1ab8d2082ad..73ee722490eaa33a7b46c1182459f9ea0164d67a 100644 (file)
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -17,12 +17,13 @@
 
 */
 
-#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 "i18n.h"
 
@@ -31,8 +32,8 @@ using std::string;
 using std::cout;
 using std::vector;
 using boost::shared_ptr;
-using boost::lexical_cast;
 using boost::optional;
+using dcp::raw_convert;
 
 ColourConversion::ColourConversion ()
        : input_gamma (2.4)
@@ -42,7 +43,7 @@ ColourConversion::ColourConversion ()
 {
        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];
                }
        }
 }
@@ -60,7 +61,7 @@ ColourConversion::ColourConversion (double i, bool il, double const m[3][3], dou
        }
 }
 
-ColourConversion::ColourConversion (shared_ptr<cxml::Node> node)
+ColourConversion::ColourConversion (cxml::NodePtr node)
        : matrix (3, 3)
 {
        input_gamma = node->number_child<double> ("InputGamma");
@@ -72,11 +73,11 @@ 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<double> ((*i)->content ());
+               matrix(ti, tj) = raw_convert<double> ((*i)->content ());
        }
 
        output_gamma = node->number_child<double> ("OutputGamma");
@@ -85,19 +86,19 @@ ColourConversion::ColourConversion (shared_ptr<cxml::Node> node)
 void
 ColourConversion::as_xml (xmlpp::Node* node) const
 {
-       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>
@@ -116,6 +117,26 @@ ColourConversion::preset () const
        return i;
 }
 
+string
+ColourConversion::identifier () const
+{
+       double numbers[12];
+
+       int n = 0;
+       numbers[n++] = input_gamma;
+       numbers[n++] = input_gamma_linearised;
+       for (int i = 0; i < 3; ++i) {
+               for (int j = 0; j < 3; ++j) {
+                       numbers[n++] = matrix (i, j);
+               }
+       }
+       numbers[n++] = output_gamma;
+
+       assert (n == 12);
+
+       return md5_digest (numbers, 12 * sizeof (double));
+}
+
 PresetColourConversion::PresetColourConversion ()
        : name (_("Untitled"))
 {
@@ -129,7 +150,7 @@ PresetColourConversion::PresetColourConversion (string n, double i, bool il, dou
 
 }
 
-PresetColourConversion::PresetColourConversion (shared_ptr<cxml::Node> node)
+PresetColourConversion::PresetColourConversion (cxml::NodePtr node)
        : conversion (node)
 {
        name = node->string_child ("Name");