projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
colour_conversion.cc
diff --git
a/src/lib/colour_conversion.cc
b/src/lib/colour_conversion.cc
index e5b1104ff9427525dcd374c76d146eedccfb1775..5ecbf4021ce4efb30f8ccb39de37eea6f127820b 100644
(file)
--- a/
src/lib/colour_conversion.cc
+++ b/
src/lib/colour_conversion.cc
@@
-18,8
+18,8
@@
*/
#include <libxml++/libxml++.h>
*/
#include <libxml++/libxml++.h>
-#include <
lib
dcp/colour_matrix.h>
-#include <
lib
dcp/raw_convert.h>
+#include <dcp/colour_matrix.h>
+#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
#include "config.h"
#include "colour_conversion.h"
#include <libcxml/cxml.h>
#include "config.h"
#include "colour_conversion.h"
@@
-34,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)
@@
-44,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];
}
}
}
}
}
}
@@
-84,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
{