std::shared_ptr

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

diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index a1885b4cb305a257c6b14827af7b0b1566993454..d0e0f46388a87c080acd7c547e833bf7e60ef07b 100644 (file)
--- 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-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,15 +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>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/foreach.hpp>
 #include <iostream>
 
@@ -40,9 +42,9 @@ using std::list;
 using std::string;
 using std::cout;
 using std::vector;
-using boost::shared_ptr;
+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;