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 aacefaa05502c9202178b2637dfa7dd5dbd50df6..5ecbf4021ce4efb30f8ccb39de37eea6f127820b 100644
(file)
--- a/
src/lib/colour_conversion.cc
+++ b/
src/lib/colour_conversion.cc
@@
-30,7
+30,6
@@
using std::list;
using std::string;
using std::list;
using std::string;
-using std::stringstream;
using std::cout;
using std::vector;
using boost::shared_ptr;
using std::cout;
using std::vector;
using boost::shared_ptr;
@@
-85,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
{