projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert...
[dcpomatic.git]
/
src
/
lib
/
colour_conversion.cc
diff --git
a/src/lib/colour_conversion.cc
b/src/lib/colour_conversion.cc
index e4a2a84bff4bc826355d0d20c60bbba4eb9b49e0..6dd4ab87675008abee80a9f517049e351ce75f16 100644
(file)
--- a/
src/lib/colour_conversion.cc
+++ b/
src/lib/colour_conversion.cc
@@
-17,13
+17,14
@@
*/
*/
-#include <boost/lexical_cast.hpp>
-#include <libxml++/libxml++.h>
-#include <dcp/colour_matrix.h>
-#include <libcxml/cxml.h>
#include "config.h"
#include "colour_conversion.h"
#include "util.h"
#include "config.h"
#include "colour_conversion.h"
#include "util.h"
+#include "md5_digester.h"
+#include <dcp/colour_matrix.h>
+#include <dcp/raw_convert.h>
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
#include "i18n.h"
#include "i18n.h"
@@
-32,8
+33,8
@@
using std::string;
using std::cout;
using std::vector;
using boost::shared_ptr;
using std::cout;
using std::vector;
using boost::shared_ptr;
-using boost::lexical_cast;
using boost::optional;
using boost::optional;
+using dcp::raw_convert;
ColourConversion::ColourConversion ()
: input_gamma (2.4)
ColourConversion::ColourConversion ()
: input_gamma (2.4)
@@
-64,8
+65,6
@@
ColourConversion::ColourConversion (double i, bool il, double const m[3][3], dou
ColourConversion::ColourConversion (cxml::NodePtr node)
: matrix (3, 3)
{
ColourConversion::ColourConversion (cxml::NodePtr node)
: matrix (3, 3)
{
- LocaleGuard lg;
-
input_gamma = node->number_child<double> ("InputGamma");
input_gamma_linearised = node->bool_child ("InputGammaLinearised");
input_gamma = node->number_child<double> ("InputGamma");
input_gamma_linearised = node->bool_child ("InputGammaLinearised");
@@
-79,30
+78,38
@@
ColourConversion::ColourConversion (cxml::NodePtr node)
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");
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_cas
t<double> ((*i)->content ());
+ matrix(ti, tj) =
raw_conver
t<double> ((*i)->content ());
}
output_gamma = node->number_child<double> ("OutputGamma");
}
}
output_gamma = node->number_child<double> ("OutputGamma");
}
+boost::optional<ColourConversion>
+ColourConversion::from_xml (cxml::NodePtr node)
+{
+ if (!node->optional_node_child ("InputGamma")) {
+ return boost::optional<ColourConversion> ();
+ }
+
+ return ColourConversion (node);
+}
+
void
ColourConversion::as_xml (xmlpp::Node* node) const
{
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("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");
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_cas
t<string> (i));
- m->set_attribute ("j",
lexical_cas
t<string> (j));
- m->add_child_text (
lexical_cas
t<string> (matrix (i, j)));
+ m->set_attribute ("i",
raw_conver
t<string> (i));
+ m->set_attribute ("j",
raw_conver
t<string> (j));
+ m->add_child_text (
raw_conver
t<string> (matrix (i, j)));
}
}
}
}
- node->add_child("OutputGamma")->add_child_text (
lexical_cas
t<string> (output_gamma));
+ node->add_child("OutputGamma")->add_child_text (
raw_conver
t<string> (output_gamma));
}
optional<size_t>
}
optional<size_t>
@@
-124,21
+131,18
@@
ColourConversion::preset () const
string
ColourConversion::identifier () const
{
string
ColourConversion::identifier () const
{
- double numbers[12];
-
- int n = 0;
- numbers[n++] = input_gamma;
- numbers[n++] = input_gamma_linearised;
+ 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) {
for (int i = 0; i < 3; ++i) {
for (int j = 0; j < 3; ++j) {
-
numbers[n++] = matrix (i, j
);
+
digester.add (matrix (i, j)
);
}
}
}
}
- numbers[n++] = output_gamma;
-
- assert (n == 12);
-
- return md5_digest (numbers, 12 * sizeof (double));
+ digester.add (output_gamma);
+
+ return digester.get ();
}
PresetColourConversion::PresetColourConversion ()
}
PresetColourConversion::PresetColourConversion ()