diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-04 23:10:39 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-04 23:10:39 +0000 |
| commit | f7642b4e1384156e3ce4f689474331ea7b958cbb (patch) | |
| tree | 49f5c5b9e830bddd32ef203d98ea004943210078 /src/lib/config.cc | |
| parent | bee98cdc1ddc5f87749de3bbf2ae5e4b2ef498c3 (diff) | |
Fix loading of 1.x metadata.
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index d43024128..306b48a9f 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -179,7 +179,10 @@ Config::read () try { for (list<cxml::NodePtr>::iterator i = cc.begin(); i != cc.end(); ++i) { - _colour_conversions.push_back (PresetColourConversion (*i)); + /* This is a bit of a hack; use 32 (the first Film state file version for the 2.x branch) + for version 2 and 10 (the current Film state version for the 1.x branch) for version 1. + */ + _colour_conversions.push_back (PresetColourConversion (*i, version == 2 ? 32 : 10)); } } catch (cxml::Error) { /* Probably failed to load an old-style ColourConversion tag; just give up */ |