From 76d7b8bd0de121a8015b595681844a5aec938d64 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 16 Jan 2016 18:02:20 +0000 Subject: Change default MonoPictureFrame constructor to something more useful. --- src/mono_picture_frame.cc | 6 ++++-- src/mono_picture_frame.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc index 357bb849..143d447c 100644 --- a/src/mono_picture_frame.cc +++ b/src/mono_picture_frame.cc @@ -76,9 +76,11 @@ MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path, int n, ASDCP:: } } -MonoPictureFrame::MonoPictureFrame () +MonoPictureFrame::MonoPictureFrame (uint8_t const * data, int size) { - _buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte); + _buffer = new ASDCP::JP2K::FrameBuffer (size); + _buffer->Size (size); + memcpy (_buffer->Data(), data, size); } /** MonoPictureFrame destructor */ diff --git a/src/mono_picture_frame.h b/src/mono_picture_frame.h index 68e4edf8..9e7a9926 100644 --- a/src/mono_picture_frame.h +++ b/src/mono_picture_frame.h @@ -48,7 +48,7 @@ class MonoPictureFrame : public boost::noncopyable public: MonoPictureFrame (boost::filesystem::path path, int n, ASDCP::AESDecContext *); MonoPictureFrame (boost::filesystem::path path); - MonoPictureFrame (); + MonoPictureFrame (uint8_t const * data, int size); ~MonoPictureFrame (); boost::shared_ptr xyz_image (int reduce = 0) const; -- cgit v1.2.3