Tidying.

[libdcp.git] / src / mono_picture_frame.h

diff --git a/src/mono_picture_frame.h b/src/mono_picture_frame.h
index 67784509a7ba7d9169e79b95fe286c2add2238d3..d6774aeffb537c6b6eb155ab0c8f8bdc0c960951 100644 (file)
--- a/src/mono_picture_frame.h
+++ b/src/mono_picture_frame.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,22 +31,25 @@
     files in the program, then also delete it here.
 */
 
+
 #ifndef LIBDCP_MONO_PICTURE_FRAME_H
 #define LIBDCP_MONO_PICTURE_FRAME_H
 
+
 /** @file  src/mono_picture_frame.h
- *  @brief MonoPictureFrame class.
+ *  @brief MonoPictureFrame class
  */
 
+
 #include "types.h"
 #include "asset_reader.h"
 #include <memory>
-#include <boost/noncopyable.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
 #include <string>
 #include <stdint.h>
 
+
 namespace ASDCP {
        namespace JP2K {
                class FrameBuffer;
@@ -55,19 +58,25 @@ namespace ASDCP {
        class AESDecContext;
 }
 
+
 namespace dcp {
 
+
 class OpenJPEGImage;
 
+
 /** @class MonoPictureFrame
  *  @brief A single frame of a 2D (monoscopic) picture asset.
  */
-class MonoPictureFrame : public Data, public boost::noncopyable
+class MonoPictureFrame : public Data
 {
 public:
        explicit MonoPictureFrame (boost::filesystem::path path);
        MonoPictureFrame (uint8_t const * data, int size);
 
+       MonoPictureFrame (MonoPictureFrame const&) = delete;
+       MonoPictureFrame& operator= (MonoPictureFrame const&) = delete;
+
        std::shared_ptr<OpenJPEGImage> xyz_image (int reduce = 0) const;
 
        uint8_t const * data () const;