#include <libcxml/cxml.h>
#include "config.h"
#include "colour_conversion.h"
+#include "util.h"
#include "i18n.h"
{
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) = libdcp::colour_matrix::srgb_to_xyz[i][j];
}
}
}
}
}
-ColourConversion::ColourConversion (shared_ptr<cxml::Node> node)
+ColourConversion::ColourConversion (cxml::NodePtr node)
: matrix (3, 3)
{
+ LocaleGuard lg;
+
input_gamma = node->number_child<double> ("InputGamma");
input_gamma_linearised = node->bool_child ("InputGammaLinearised");
}
}
- 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 ());
void
ColourConversion::as_xml (xmlpp::Node* node) const
{
+ LocaleGuard lg;
+
node->add_child("InputGamma")->add_child_text (lexical_cast<string> (input_gamma));
node->add_child("InputGammaLinearised")->add_child_text (input_gamma_linearised ? "1" : "0");
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"))
{
}
-PresetColourConversion::PresetColourConversion (shared_ptr<cxml::Node> node)
+PresetColourConversion::PresetColourConversion (cxml::NodePtr node)
: conversion (node)
{
name = node->string_child ("Name");