Merge master.

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

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index e7c9dee9a3ac35373668433e6208d02128aafc0a..cb68655cee2f2a6362dc3be6d0089d095db5b2d9 100644 (file)
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -40,6 +40,10 @@ public:
        bool seek (double);
        bool pass ();
 
+       boost::shared_ptr<const ImageMagickContent> content () const {
+               return _imagemagick_content;
+       }
+
 protected:
        PixelFormat pixel_format () const;
 
@@ -65,4 +69,5 @@ private:
        boost::shared_ptr<const ImageMagickContent> _imagemagick_content;
        boost::shared_ptr<Image> _image;
        ContentVideoFrame _position;
+       mutable boost::optional<libdcp::Size> _native_size;
 };