diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-10 14:26:44 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-10 14:26:44 +0100 |
| commit | a97dffe585e8e185c57a3f1b025cffa6da9525d2 (patch) | |
| tree | ca367b6965afcda95a9c1ef86114c855ad3f0a88 /src/lib/dcp_video.cc | |
| parent | 5c0a67869dbddb924c9f5ccb4126aa06d85b9b8b (diff) | |
Tidy up J2KImageProxy a bit.
Diffstat (limited to 'src/lib/dcp_video.cc')
| -rw-r--r-- | src/lib/dcp_video.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index af614a10f..78cbe65bd 100644 --- a/src/lib/dcp_video.cc +++ b/src/lib/dcp_video.cc @@ -104,7 +104,7 @@ DCPVideo::DCPVideo (shared_ptr<const PlayerVideo> frame, shared_ptr<const cxml:: /** J2K-encode this frame on the local host. * @return Encoded data. */ -shared_ptr<Data> +Data DCPVideo::encode_locally (dcp::NoteHandler note) { shared_ptr<dcp::XYZImage> xyz; @@ -236,7 +236,7 @@ DCPVideo::encode_locally (dcp::NoteHandler note) break; } - shared_ptr<Data> enc (new Data (cio->buffer, cio_tell (cio))); + Data enc (cio->buffer, cio_tell (cio)); opj_cio_close (cio); free (parameters.cp_comment); @@ -249,7 +249,7 @@ DCPVideo::encode_locally (dcp::NoteHandler note) * @param serv Server to send to. * @return Encoded data. */ -shared_ptr<Data> +Data DCPVideo::encode_remotely (ServerDescription serv) { boost::asio::io_service io_service; @@ -280,8 +280,8 @@ DCPVideo::encode_remotely (ServerDescription serv) /* Read the response (JPEG2000-encoded data); this blocks until the data is ready and sent back. */ - shared_ptr<Data> e (new Data (socket->read_uint32 ())); - socket->read (e->data().get(), e->size()); + Data e (socket->read_uint32 ()); + socket->read (e.data().get(), e.size()); LOG_GENERAL (N_("Finished remotely-encoded frame %1"), _index); |