Various alignment adjustments.

[dcpomatic.git] / src / lib / image_proxy.h

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index b279e634443736628706103b88dc6fb0b960c698..8817845d997d8d77643814328609489a42b26e79 100644 (file)
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -54,13 +54,17 @@ namespace cxml {
  *  the TIFF data compressed until the decompressed image is needed.
  *  At this point, the class decodes the TIFF to an Image.
  */
-class ImageProxy : public boost::noncopyable
+class ImageProxy
 {
 public:
+       ImageProxy () {}
        virtual ~ImageProxy () {}
 
+       ImageProxy (ImageProxy const&) = delete;
+       ImageProxy& operator= (ImageProxy const&) = delete;
+
        struct Result {
-               Result (std::shared_ptr<Image> image_, int log2_scaling_)
+               Result (std::shared_ptr<const Image> image_, int log2_scaling_)
                        : image (image_)
                        , log2_scaling (log2_scaling_)
                        , error (false)
@@ -72,8 +76,7 @@ public:
                        , error (error_)
                {}
 
-               /** Image (which will be aligned) */
-               std::shared_ptr<Image> image;
+               std::shared_ptr<const Image> image;
                /** log2 of any scaling down that has already been applied to the image;
                 *  e.g. if the image is already half the size of the original, this value
                 *  will be 1.
@@ -88,6 +91,7 @@ public:
         *  can be used as an optimisation.
         */
        virtual Result image (
+               bool aligned,
                boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
                ) const = 0;
 
@@ -99,7 +103,7 @@ public:
         *  This method may be called in a different thread to image().
         *  @return log2 of any scaling down that will be applied to the image.
         */
-       virtual int prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const { return 0; }
+       virtual int prepare (bool, boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const { return 0; }
        virtual size_t memory_used () const = 0;
 };