Bump version

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 10cb13ecc2a0165829dfed0244fc7680049a20e7..9f981c61918b111874858a1af5847a8b8c8c174b 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -65,8 +65,8 @@ Config::Config ()
        _allowed_dcp_frame_rates.push_back (50);
        _allowed_dcp_frame_rates.push_back (60);
 
-       _colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::xyz_to_rgb, 2.6));
-       _colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, libdcp::colour_matrix::xyz_to_rgb, 2.6));
+       _colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::srgb_to_xyz, 2.6));
+       _colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, libdcp::colour_matrix::srgb_to_xyz, 2.6));
 }
 
 void
@@ -77,7 +77,8 @@ Config::read ()
                return;
        }
 
-       cxml::File f (file (false), "Config");
+       cxml::Document f ("Config");
+       f.read_file (file (false));
        optional<string> c;
 
        _num_local_encoding_threads = f.number_child<int> ("NumLocalEncodingThreads");