X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcolour_conversion.cc;h=c3fa05426f3a2877b7b51cbf5d719ee2d2451794;hb=86214f4619476b1a4951e15f002a93743b5f7a1e;hp=95d267a8c9e26afa3443eac4250a7ffe4dff489b;hpb=39960754026821775e6753a83f6934b8befa0dc2;p=dcpomatic.git diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc index 95d267a8c..c3fa05426 100644 --- a/src/lib/colour_conversion.cc +++ b/src/lib/colour_conversion.cc @@ -61,7 +61,7 @@ ColourConversion::ColourConversion (double i, bool il, double const m[3][3], dou } } -ColourConversion::ColourConversion (shared_ptr node) +ColourConversion::ColourConversion (cxml::NodePtr node) : matrix (3, 3) { LocaleGuard lg; @@ -75,8 +75,8 @@ ColourConversion::ColourConversion (shared_ptr node) } } - list > m = node->node_children ("Matrix"); - for (list >::iterator i = m.begin(); i != m.end(); ++i) { + list m = node->node_children ("Matrix"); + for (list::iterator i = m.begin(); i != m.end(); ++i) { int const ti = (*i)->number_attribute ("i"); int const tj = (*i)->number_attribute ("j"); matrix(ti, tj) = lexical_cast ((*i)->content ()); @@ -154,7 +154,7 @@ PresetColourConversion::PresetColourConversion (string n, double i, bool il, dou } -PresetColourConversion::PresetColourConversion (shared_ptr node) +PresetColourConversion::PresetColourConversion (cxml::NodePtr node) : conversion (node) { name = node->string_child ("Name");