Improve efficiency of DCP -> image decoding.

[dcpomatic.git] / src / lib / j2k_image_proxy.cc

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 09eaa4695beff11a0ba446c074b6cb0ab99f1145..2c4a2db5b1763e89611d1c6d3bcc9242bb6b1711 100644 (file)
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -77,15 +77,15 @@ J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
 shared_ptr<Image>
 J2KImageProxy::image (optional<dcp::NoteHandler> note) const
 {
-       shared_ptr<Image> image (new Image (PIX_FMT_RGB48LE, _size, false));
+       shared_ptr<Image> image (new Image (PIX_FMT_RGB48LE, _size, true));
 
        if (_mono) {
-               _mono->rgb_frame (reinterpret_cast<uint16_t*> (image->data()[0]), note);
+               _mono->rgb_frame (image, note);
        } else {
-               _stereo->rgb_frame (_eye, reinterpret_cast<uint16_t*> (image->data()[0]));
+               _stereo->rgb_frame (_eye, image);
        }
 
-       return shared_ptr<Image> (new Image (image, true));
+       return image;
 }
 
 void