projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include rearrangement.
[dcpomatic.git]
/
src
/
lib
/
colour_conversion.cc
diff --git
a/src/lib/colour_conversion.cc
b/src/lib/colour_conversion.cc
index cd1a81b257dcadfa76b1c6196ae7e7267f9dfce6..6dd4ab87675008abee80a9f517049e351ce75f16 100644
(file)
--- a/
src/lib/colour_conversion.cc
+++ b/
src/lib/colour_conversion.cc
@@
-17,13
+17,14
@@
*/
*/
-#include <libxml++/libxml++.h>
-#include <libdcp/colour_matrix.h>
-#include <libdcp/raw_convert.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"
@@
-33,7
+34,7
@@
using std::cout;
using std::vector;
using boost::shared_ptr;
using boost::optional;
using std::vector;
using boost::shared_ptr;
using boost::optional;
-using
lib
dcp::raw_convert;
+using dcp::raw_convert;
ColourConversion::ColourConversion ()
: input_gamma (2.4)
ColourConversion::ColourConversion ()
: input_gamma (2.4)
@@
-43,7
+44,7
@@
ColourConversion::ColourConversion ()
{
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) {
- matrix (i, j) =
lib
dcp::colour_matrix::srgb_to_xyz[i][j];
+ matrix (i, j) = dcp::colour_matrix::srgb_to_xyz[i][j];
}
}
}
}
}
}
@@
-83,6
+84,16
@@
ColourConversion::ColourConversion (cxml::NodePtr node)
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
{
@@
-120,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 ()