X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcolour_conversion.cc;h=6cf4ed646a6b9625e269f3eed5ccfd2b6dcd8357;hp=aa6b61fed29e3d861f118b0855ab6bf3ddb783d4;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hpb=b81241ce69a689629307832f802ac4faa6ed885f

diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index aa6b61fed..6cf4ed646 100644
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,14 +22,17 @@
 #include "colour_conversion.h"
 #include "util.h"
 #include "digester.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
 #include <dcp/chromaticity.h>
-#include <dcp/colour_matrix.h>
 #include <dcp/gamma_transfer_function.h>
 #include <dcp/modified_gamma_transfer_function.h>
+#include <dcp/identity_transfer_function.h>
+#include <dcp/s_gamut3_transfer_function.h>
 #include <libcxml/cxml.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-#include <boost/foreach.hpp>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 #include "i18n.h"
@@ -38,9 +41,10 @@ using std::list;
 using std::string;
 using std::cout;
 using std::vector;
-using boost::shared_ptr;
+using std::make_shared;
+using std::shared_ptr;
 using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 using dcp::raw_convert;
 
 vector<PresetColourConversion> PresetColourConversion::_presets;
@@ -65,17 +69,19 @@ ColourConversion::ColourConversion (cxml::NodePtr node, int version)
 
 		/* Version 2.x */
 
-		cxml::ConstNodePtr in_node = node->node_child ("InputTransferFunction");
-		string in_type = in_node->string_child ("Type");
+		auto in_node = node->node_child ("InputTransferFunction");
+		auto in_type = in_node->string_child ("Type");
 		if (in_type == "Gamma") {
-			_in.reset (new dcp::GammaTransferFunction (in_node->number_child<double> ("Gamma")));
+			_in = make_shared<dcp::GammaTransferFunction>(in_node->number_child<double> ("Gamma"));
 		} else if (in_type == "ModifiedGamma") {
-			_in.reset (new dcp::ModifiedGammaTransferFunction (
-					   in_node->number_child<double> ("Power"),
-					   in_node->number_child<double> ("Threshold"),
-					   in_node->number_child<double> ("A"),
-					   in_node->number_child<double> ("B")
-					   ));
+			_in = make_shared<dcp::ModifiedGammaTransferFunction>(
+					   in_node->number_child<double>("Power"),
+					   in_node->number_child<double>("Threshold"),
+					   in_node->number_child<double>("A"),
+					   in_node->number_child<double>("B")
+					   );
+		} else if (in_type == "SGamut3") {
+			_in = make_shared<dcp::SGamut3TransferFunction>();
 		}
 
 	} else {
@@ -89,16 +95,16 @@ ColourConversion::ColourConversion (cxml::NodePtr node, int version)
 		}
 	}
 
-	_yuv_to_rgb = static_cast<dcp::YUVToRGB> (node->optional_number_child<int>("YUVToRGB").get_value_or (dcp::YUV_TO_RGB_REC601));
+	_yuv_to_rgb = static_cast<dcp::YUVToRGB>(node->optional_number_child<int>("YUVToRGB").get_value_or(static_cast<int>(dcp::YUVToRGB::REC601)));
 
-	list<cxml::NodePtr> m = node->node_children ("Matrix");
+	auto m = node->node_children ("Matrix");
 	if (!m.empty ()) {
 		/* Read in old <Matrix> nodes and convert them to chromaticities */
 		boost::numeric::ublas::matrix<double> C (3, 3);
-		for (list<cxml::NodePtr>::iterator i = m.begin(); i != m.end(); ++i) {
-			int const ti = (*i)->number_attribute<int> ("i");
-			int const tj = (*i)->number_attribute<int> ("j");
-			C(ti, tj) = raw_convert<double> ((*i)->content ());
+		for (auto i: m) {
+			int const ti = i->number_attribute<int>("i");
+			int const tj = i->number_attribute<int>("j");
+			C(ti, tj) = raw_convert<double>(i->content());
 		}
 
 		double const rd = C(0, 0) + C(1, 0) + C(2, 0);
@@ -122,7 +128,12 @@ ColourConversion::ColourConversion (cxml::NodePtr node, int version)
 		}
 	}
 
-	_out.reset (new dcp::GammaTransferFunction (node->number_child<double> ("OutputGamma")));
+	auto gamma = node->optional_number_child<double>("OutputGamma");
+	if (gamma) {
+		_out = make_shared<dcp::GammaTransferFunction>(node->number_child<double>("OutputGamma"));
+	} else {
+		_out = make_shared<dcp::IdentityTransferFunction>();
+	}
 }
 
 boost::optional<ColourConversion>
@@ -138,18 +149,20 @@ ColourConversion::from_xml (cxml::NodePtr node, int version)
 void
 ColourConversion::as_xml (xmlpp::Node* node) const
 {
-	xmlpp::Node* in_node = node->add_child ("InputTransferFunction");
+	auto in_node = node->add_child ("InputTransferFunction");
 	if (dynamic_pointer_cast<const dcp::GammaTransferFunction> (_in)) {
-		shared_ptr<const dcp::GammaTransferFunction> tf = dynamic_pointer_cast<const dcp::GammaTransferFunction> (_in);
+		auto tf = dynamic_pointer_cast<const dcp::GammaTransferFunction> (_in);
 		in_node->add_child("Type")->add_child_text ("Gamma");
 		in_node->add_child("Gamma")->add_child_text (raw_convert<string> (tf->gamma ()));
 	} else if (dynamic_pointer_cast<const dcp::ModifiedGammaTransferFunction> (_in)) {
-		shared_ptr<const dcp::ModifiedGammaTransferFunction> tf = dynamic_pointer_cast<const dcp::ModifiedGammaTransferFunction> (_in);
+		auto tf = dynamic_pointer_cast<const dcp::ModifiedGammaTransferFunction> (_in);
 		in_node->add_child("Type")->add_child_text ("ModifiedGamma");
 		in_node->add_child("Power")->add_child_text (raw_convert<string> (tf->power ()));
 		in_node->add_child("Threshold")->add_child_text (raw_convert<string> (tf->threshold ()));
 		in_node->add_child("A")->add_child_text (raw_convert<string> (tf->A ()));
 		in_node->add_child("B")->add_child_text (raw_convert<string> (tf->B ()));
+	} else if (dynamic_pointer_cast<const dcp::SGamut3TransferFunction> (_in)) {
+		in_node->add_child("Type")->add_child_text ("SGamut3");
 	}
 
 	node->add_child("YUVToRGB")->add_child_text (raw_convert<string> (static_cast<int> (_yuv_to_rgb)));
@@ -166,20 +179,23 @@ ColourConversion::as_xml (xmlpp::Node* node) const
 		node->add_child("AdjustedWhiteY")->add_child_text (raw_convert<string> (_adjusted_white.get().y));
 	}
 
-	node->add_child("OutputGamma")->add_child_text (raw_convert<string> (dynamic_pointer_cast<const dcp::GammaTransferFunction> (_out)->gamma ()));
+	if (dynamic_pointer_cast<const dcp::GammaTransferFunction> (_out)) {
+		shared_ptr<const dcp::GammaTransferFunction> gf = dynamic_pointer_cast<const dcp::GammaTransferFunction> (_out);
+		node->add_child("OutputGamma")->add_child_text (raw_convert<string> (gf->gamma ()));
+	}
 }
 
 optional<size_t>
 ColourConversion::preset () const
 {
-	vector<PresetColourConversion> presets = PresetColourConversion::all ();
+	auto presets = PresetColourConversion::all ();
 	size_t i = 0;
 	while (i < presets.size() && presets[i].conversion != *this) {
 		++i;
 	}
 
 	if (i >= presets.size ()) {
-		return optional<size_t> ();
+		return {};
 	}
 
 	return i;
@@ -215,7 +231,10 @@ ColourConversion::identifier () const
 		digester.add (_adjusted_white.get().y);
 	}
 
-	digester.add (dynamic_pointer_cast<const dcp::GammaTransferFunction> (_out)->gamma ());
+	auto gf = dynamic_pointer_cast<const dcp::GammaTransferFunction> (_out);
+	if (gf) {
+		digester.add (gf->gamma ());
+	}
 
 	return digester.get ();
 }
@@ -268,12 +287,13 @@ PresetColourConversion::setup_colour_conversion_presets ()
 	_presets.push_back (PresetColourConversion (_("P3"), "p3", dcp::ColourConversion::p3_to_xyz ()));
 	_presets.push_back (PresetColourConversion (_("Rec. 1886"), "rec1886", dcp::ColourConversion::rec1886_to_xyz ()));
 	_presets.push_back (PresetColourConversion (_("Rec. 2020"), "rec2020", dcp::ColourConversion::rec2020_to_xyz ()));
+	_presets.push_back (PresetColourConversion (_("S-Gamut3/S-Log3"), "sgamut3", dcp::ColourConversion::s_gamut3_to_xyz ()));
 }
 
 PresetColourConversion
 PresetColourConversion::from_id (string s)
 {
-	BOOST_FOREACH (PresetColourConversion const& i, _presets) {
+	for (auto const& i: _presets) {
 		if (i.id == s) {
 			return i;
 		}