Merge master.

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

diff --git a/src/lib/image.h b/src/lib/image.h
index 1c096be718f8e33cc4b156530cb9ba470950b787..172250eb1bb253ffd6a87e9998951ca6b534a7c3 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -31,9 +31,10 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavfilter/avfilter.h>
 }
-#include <libdcp/image.h>
+#include <dcp/image.h>
 #include "util.h"
 #include "position.h"
+#include "position_image.h"
 
 class Scaler;
 
@@ -58,14 +59,15 @@ public:
        int lines (int) const;
 
        boost::shared_ptr<Image> scale (dcp::Size, Scaler const *, AVPixelFormat, bool aligned) const;
-       boost::shared_ptr<Image> post_process (std::string, bool aligned) const;
        boost::shared_ptr<Image> crop (Crop c, bool aligned) const;
 
        boost::shared_ptr<Image> crop_scale_window (Crop c, dcp::Size, dcp::Size, Scaler const *, AVPixelFormat, bool aligned) const;
        
        void make_black ();
+       void make_transparent ();
        void alpha_blend (boost::shared_ptr<const Image> image, Position<int> pos);
        void copy (boost::shared_ptr<const Image> image, Position<int> pos);
+       void fade (float);
 
        void read_from_socket (boost::shared_ptr<Socket>);
        void write_to_socket (boost::shared_ptr<Socket>) const;
@@ -74,8 +76,10 @@ public:
                return _pixel_format;
        }
 
+       std::string digest () const;
+
 private:
-       friend class pixel_formats_test;
+       friend struct pixel_formats_test;
        
        void allocate ();
        void swap (Image &);
@@ -90,4 +94,7 @@ private:
        bool _aligned;
 };
 
+extern PositionImage merge (std::list<PositionImage> images);
+extern bool operator== (Image const & a, Image const & b);
+
 #endif