diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-29 20:02:56 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-29 20:02:56 +0000 |
| commit | bfe277e664a03ec47cd6bee7e1b1e4aca6eb38e6 (patch) | |
| tree | 6bdc6fa07f2cde0565c4025ab552f2c0fc9c3b2f /src/lib/colour_conversion.cc | |
| parent | 6a0da4eb43fc684c0f54a7a3a817a31dc8db7109 (diff) | |
| parent | 27867be66579551018c926ed3339624e463c1b08 (diff) | |
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
Diffstat (limited to 'src/lib/colour_conversion.cc')
| -rw-r--r-- | src/lib/colour_conversion.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc index ad09458f9..6c5a6679f 100644 --- a/src/lib/colour_conversion.cc +++ b/src/lib/colour_conversion.cc @@ -185,16 +185,17 @@ PresetColourConversion::PresetColourConversion () } PresetColourConversion::PresetColourConversion (string n, dcp::ColourConversion conversion_) - : name (n) - , conversion (conversion_) + : conversion (conversion_) + , name (n) { } PresetColourConversion::PresetColourConversion (cxml::NodePtr node, int version) : conversion (node, version) + , name (node->string_child ("Name")) { - name = node->string_child ("Name"); + } void |