Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0

4 files changed, 30 insertions, 4 deletions

diff --git a/src/j2k.cc b/src/j2k.cc
index 4c29abfc..15f360c5 100644
--- a/src/j2k.cc
+++ b/src/j2k.cc
@@ -257,6 +257,9 @@ error_callback (char const * msg, void *)
 	throw MiscError (msg);
 }
 
+/** @xyz Picture to compress.  Parts of xyz's data WILL BE OVERWRITTEN by libopenjpeg so xyz cannot be re-used
+ *  after this call; see opj_j2k_encode where if l_reuse_data is false it will set l_tilec->data = l_img_comp->data.
+ */
 Data
 dcp::compress_j2k (shared_ptr<const OpenJPEGImage> xyz, int bandwidth, int frames_per_second, bool threed, bool fourk)
 {
diff --git a/src/openjpeg_image.cc b/src/openjpeg_image.cc
index 32d1da3f..401b6aa1 100644
--- a/src/openjpeg_image.cc
+++ b/src/openjpeg_image.cc
@@ -53,6 +53,28 @@ OpenJPEGImage::OpenJPEGImage (opj_image_t* image)
 	DCP_ASSERT (_opj_image->numcomps == 3);
 }
 
+OpenJPEGImage::OpenJPEGImage (OpenJPEGImage const & other)
+{
+	_opj_image = reinterpret_cast<opj_image_t*> (malloc (sizeof (opj_image_t)));
+	DCP_ASSERT (_opj_image);
+	memcpy (_opj_image, other._opj_image, sizeof (opj_image_t));
+
+	int const data_size = _opj_image->x1 * _opj_image->y1 * 4;
+
+	_opj_image->comps = reinterpret_cast<opj_image_comp_t*> (malloc (_opj_image->numcomps * sizeof (opj_image_comp_t)));
+	DCP_ASSERT (_opj_image->comps);
+	memcpy (_opj_image->comps, other._opj_image->comps, _opj_image->numcomps * sizeof (opj_image_comp_t));
+	for (unsigned int i = 0; i < _opj_image->numcomps; ++i) {
+		_opj_image->comps[i].data = reinterpret_cast<OPJ_INT32*> (malloc (data_size));
+		DCP_ASSERT (_opj_image->comps[i].data);
+		memcpy (_opj_image->comps[i].data, other._opj_image->comps[i].data, data_size);
+	}
+
+	_opj_image->icc_profile_buf = reinterpret_cast<OPJ_BYTE*> (malloc (_opj_image->icc_profile_len));
+	DCP_ASSERT (_opj_image->icc_profile_buf);
+	memcpy (_opj_image->icc_profile_buf, other._opj_image->icc_profile_buf, _opj_image->icc_profile_len);
+}
+
 /** Construct a new OpenJPEGImage with undefined contents.
  *  @param size Size for the frame in pixels.
  */
diff --git a/src/openjpeg_image.h b/src/openjpeg_image.h
index 20391e2d..e789cd40 100644
--- a/src/openjpeg_image.h
+++ b/src/openjpeg_image.h
@@ -45,15 +45,16 @@ namespace dcp {
 /** @class OpenJPEGImage
  *  @brief A wrapper of libopenjpeg's opj_image_t.
  */
-class OpenJPEGImage : public boost::noncopyable
+class OpenJPEGImage
 {
 public:
 	explicit OpenJPEGImage (opj_image_t *);
+	explicit OpenJPEGImage (OpenJPEGImage const & other);
 	explicit OpenJPEGImage (Size);
 	~OpenJPEGImage ();
 
 	int* data (int) const;
-	dcp::Size size () const;
+	Size size () const;
 	int precision (int component) const;
 	bool srgb () const;
 
diff --git a/src/rgb_xyz.cc b/src/rgb_xyz.cc
index d299340e..f0480431 100644
--- a/src/rgb_xyz.cc
+++ b/src/rgb_xyz.cc
@@ -276,8 +276,8 @@ dcp::combined_rgb_to_xyz (ColourConversion const & conversion, double* matrix)
 /** @param rgb RGB data; packed RGB 16:16:16, 48bpp, 16R, 16G, 16B,
  *  with the 2-byte value for each R/G/B component stored as
  *  little-endian; i.e. AV_PIX_FMT_RGB48LE.
- *  @param size of RGB image in pixels.
- *  @param stride of RGB data in pixels.
+ *  @param size size of RGB image in pixels.
+ *  @param size stride of RGB data in pixels.
  */
 shared_ptr<dcp::OpenJPEGImage>
 dcp::rgb_to_xyz (