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

1 files changed, 3 insertions, 2 deletions

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;