summaryrefslogtreecommitdiff
path: root/src/lib/colour_conversion.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-10-25 14:47:43 +0100
committerCarl Hetherington <cth@carlh.net>2014-10-25 14:47:43 +0100
commitb6c780d3107557d452c6612d715d01e2be52dbda (patch)
tree3548fe3eef61f3b0145bb33a57a89f97bfa75f50 /src/lib/colour_conversion.cc
parente725a6b4bce2a05275ee611965c62d6803f3bf7c (diff)
parent0dcbc398124f740e4fd7b552926f601a3e5c755e (diff)
Merge master.
Diffstat (limited to 'src/lib/colour_conversion.cc')
-rw-r--r--src/lib/colour_conversion.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index c836cc271..5ecbf4021 100644
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -84,6 +84,16 @@ ColourConversion::ColourConversion (cxml::NodePtr node)
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
{