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.h | |
| 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.h')
| -rw-r--r-- | src/lib/raw_image_proxy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/raw_image_proxy.h b/src/lib/raw_image_proxy.h index 6707f689c..62561c6fb 100644 --- a/src/lib/raw_image_proxy.h +++ b/src/lib/raw_image_proxy.h @@ -22,8 +22,8 @@ class RawImageProxy : public ImageProxy { public: - RawImageProxy (boost::shared_ptr<Image>, boost::shared_ptr<Log> log); - RawImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket, boost::shared_ptr<Log> log); + RawImageProxy (boost::shared_ptr<Image>); + RawImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket); boost::shared_ptr<Image> image () const; void add_metadata (xmlpp::Node *) const; |