Use an enum class for Marker.

[libdcp.git] / src / openjpeg_image.h

diff --git a/src/openjpeg_image.h b/src/openjpeg_image.h
index 20391e2dba4cc47c4f3ab01d6b2a9982753b40d6..002e2a834df16c5120127daca1161b25e7bcb318 100644 (file)
--- a/src/openjpeg_image.h
+++ b/src/openjpeg_image.h
@@ -45,17 +45,20 @@ 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 (uint8_t const * in_16, dcp::Size size, int stride);
        ~OpenJPEGImage ();
 
        int* data (int) const;
-       dcp::Size size () const;
+       Size size () const;
        int precision (int component) const;
        bool srgb () const;
+       int factor (int component) const;
 
        /** @return Pointer to opj_image_t struct.  The caller
         *  must not delete this.
@@ -65,6 +68,8 @@ public:
        }
 
 private:
+       void create (Size size);
+
        opj_image_t* _opj_image; ///< opj_image_t that we are managing
 };