Merge master.

[dcpomatic.git] / src / lib / colour_conversion.cc

diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index c836cc2715728e8c75f09eb5271d4b003748dbc3..5ecbf4021ce4efb30f8ccb39de37eea6f127820b 100644 (file)
--- 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
 {