Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/image.h b/src/lib/image.h
index ce57c5317f4362d49e93391ace25d27c0bfa3a5f..73f2313c1a03f297c22960d5ba290aa83d927fb9 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -33,16 +33,17 @@ 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);
-       Image (AVFrame *);
-       Image (Image const &);
+       explicit Image (AVFrame *);
+       explicit Image (Image const &);
        Image (boost::shared_ptr<const Image>, bool);
        Image& operator= (Image const &);
        ~Image ();
@@ -59,6 +60,7 @@ public:
        dcp::Size sample_size (int) const;
        float bytes_per_pixel (int) const;
 
+       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
@@ -79,7 +81,9 @@ public:
 
        size_t memory_used () const;
 
-       static boost::shared_ptr<Image> ensure_aligned (boost::shared_ptr<Image> image);
+       dcp::Data as_png () const;
+
+       static boost::shared_ptr<const Image> ensure_aligned (boost::shared_ptr<const Image> image);
 
 private:
        friend struct pixel_formats_test;