summaryrefslogtreecommitdiff
path: root/src/lib/j2k_image_proxy.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-11-07 22:33:37 +0000
committerCarl Hetherington <cth@carlh.net>2014-11-07 22:33:37 +0000
commit87da92b45a9a0cf4ce809ea580a78c4dd5d96021 (patch)
tree4aeb53945102dbbd373b522917b6878478f5d206 /src/lib/j2k_image_proxy.cc
parent9980c40a47abe24f8dd3cb16e14ad4a3254a8465 (diff)
Remove log from ImageProxy hierarchy.
Diffstat (limited to 'src/lib/j2k_image_proxy.cc')
-rw-r--r--src/lib/j2k_image_proxy.cc13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 6924fad79..1fe854cd1 100644
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -31,25 +31,22 @@
using std::string;
using boost::shared_ptr;
-J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size size, shared_ptr<Log> log)
- : ImageProxy (log)
- , _mono (frame)
+J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size size)
+ : _mono (frame)
, _size (size)
{
}
-J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size size, dcp::Eye eye, shared_ptr<Log> log)
- : ImageProxy (log)
- , _stereo (frame)
+J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size size, dcp::Eye eye)
+ : _stereo (frame)
, _size (size)
, _eye (eye)
{
}
-J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket, shared_ptr<Log> log)
- : ImageProxy (log)
+J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
{
_size = dcp::Size (xml->number_child<int> ("Width"), xml->number_child<int> ("Height"));
if (xml->optional_number_child<int> ("Eye")) {