1 files changed, 14 insertions, 7 deletions
diff --git a/src/mono_j2k_picture_frame.cc b/src/mono_j2k_picture_frame.cc
index c2b3cfd2..c7af0e2e 100644
--- a/src/mono_j2k_picture_frame.cc
+++ b/src/mono_j2k_picture_frame.cc
@@ -66,7 +66,7 @@ MonoJ2KPictureFrame::MonoJ2KPictureFrame (boost::filesystem::path path)
 		boost::throw_exception (FileError("could not open JPEG2000 file", path, errno));
 	}
 
-	if (f.read(data(), 1, _buffer.Capacity()) != _buffer.Capacity()) {
+	if (f.read(_buffer.Data(), 1, _buffer.Capacity()) != _buffer.Capacity()) {
 		boost::throw_exception (FileError("could not read from JPEG2000 file", path, errno));
 	}
 
@@ -99,17 +99,24 @@ MonoJ2KPictureFrame::MonoJ2KPictureFrame (uint8_t const * data, int size)
 }
 
 
-uint8_t const *
-MonoJ2KPictureFrame::data () const
+MonoJ2KPictureFrame::MonoJ2KPictureFrame(MonoJ2KPictureFrame&& other)
+	: _buffer(std::move(other._buffer))
 {
-	return _buffer.RoData();
+
 }
 
 
-uint8_t *
-MonoJ2KPictureFrame::data ()
+MonoJ2KPictureFrame& MonoJ2KPictureFrame::operator=(MonoJ2KPictureFrame&& other)
 {
-	return _buffer.Data();
+	_buffer = std::move(other._buffer);
+	return *this;
+}
+
+
+uint8_t const *
+MonoJ2KPictureFrame::data () const
+{
+	return _buffer.RoData();
 }