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/player_video.cc | |
| parent | bee98cdc1ddc5f87749de3bbf2ae5e4b2ef498c3 (diff) | |
Fix loading of 1.x metadata.
Diffstat (limited to 'src/lib/player_video.cc')
| -rw-r--r-- | src/lib/player_video.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index fae66bf62..94e6f3f2a 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,6 +23,7 @@ #include "image_proxy.h" #include "j2k_image_proxy.h" #include "scaler.h" +#include "film.h" using std::string; using std::cout; @@ -68,7 +69,9 @@ PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket _scaler = Scaler::from_id (node->string_child ("Scaler")); _eyes = (Eyes) node->number_child<int> ("Eyes"); _part = (Part) node->number_child<int> ("Part"); - _colour_conversion = ColourConversion::from_xml (node); + + /* Assume that the ColourConversion uses the current state version */ + _colour_conversion = ColourConversion::from_xml (node, Film::current_state_version); _in = image_proxy_factory (node->node_child ("In"), socket); |