swaroop: fix encryption of files encoded from DCP.

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

diff --git a/src/lib/image.h b/src/lib/image.h
index f71a47b0c7c9a1c3cf9f4e66105f817689a29fb9..4b059ff36fb8c7534d4559015409d282b5a50056 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -33,11 +33,12 @@ extern "C" {
 }
 #include <dcp/colour_conversion.h>
 #include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
 
 struct AVFrame;
 class Socket;
 
-class Image
+class Image : public boost::enable_shared_from_this<Image>
 {
 public:
        Image (AVPixelFormat p, dcp::Size s, bool aligned, int extra_pixels = 0);
@@ -62,7 +63,7 @@ public:
        boost::shared_ptr<Image> convert_pixel_format (dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast) const;
        boost::shared_ptr<Image> scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast) const;
        boost::shared_ptr<Image> crop_scale_window (
-               Crop crop, dcp::Size inter_size, dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast
+               Crop crop, dcp::Size inter_size, dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, VideoRange video_range, AVPixelFormat out_format, bool aligned, bool fast
                ) const;
 
        void make_black ();
@@ -80,7 +81,11 @@ public:
 
        size_t memory_used () const;
 
-       static boost::shared_ptr<Image> ensure_aligned (boost::shared_ptr<Image> image);
+       dcp::Data as_png () const;
+
+       void png_error (char const * message);
+
+       static boost::shared_ptr<const Image> ensure_aligned (boost::shared_ptr<const Image> image);
 
 private:
        friend struct pixel_formats_test;