diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-11-07 22:33:52 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-11-07 22:33:52 +0000 |
| commit | 985a83ffbf251db481150221914ef74fbfe549b2 (patch) | |
| tree | 5de2be442f41d3117102011c4ef92e375b0f0e25 /src/lib/raw_image_proxy.cc | |
| parent | 8e4f48a96af091e7d90387aa027d65ac285a8201 (diff) | |
| parent | 87da92b45a9a0cf4ce809ea580a78c4dd5d96021 (diff) | |
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Diffstat (limited to 'src/lib/raw_image_proxy.cc')
| -rw-r--r-- | src/lib/raw_image_proxy.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/raw_image_proxy.cc b/src/lib/raw_image_proxy.cc index 7e0688d13..8e8bf8824 100644 --- a/src/lib/raw_image_proxy.cc +++ b/src/lib/raw_image_proxy.cc @@ -31,15 +31,13 @@ extern "C" { using std::string; using boost::shared_ptr; -RawImageProxy::RawImageProxy (shared_ptr<Image> image, shared_ptr<Log> log) - : ImageProxy (log) - , _image (image) +RawImageProxy::RawImageProxy (shared_ptr<Image> image) + : _image (image) { } -RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket, shared_ptr<Log> log) - : ImageProxy (log) +RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket) { dcp::Size size ( xml->number_child<int> ("Width"), xml->number_child<int> ("Height") |