X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.h;h=f83bf6998111defbb49fcd49d67dea6703099992;hb=5dc36423e504f29752599cfa3ae72433467b4644;hp=6af74a8c5ee16e641c817f27361b4757118e1295;hpb=d6be9f27147113dc6355ed0de7c99d1312aaeebd;p=dcpomatic.git

diff --git a/src/lib/image.h b/src/lib/image.h
index 6af74a8c5..f83bf6998 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -58,12 +58,13 @@ public:
 	int lines (int) const;
 
 	boost::shared_ptr<Image> scale (libdcp::Size, Scaler const *, AVPixelFormat, bool aligned) const;
-	boost::shared_ptr<Image> post_process (std::string, bool aligned) const;
-	void alpha_blend (boost::shared_ptr<const Image> image, Position<int> pos);
-	void copy (boost::shared_ptr<const Image> image, Position<int> pos);
 	boost::shared_ptr<Image> crop (Crop c, bool aligned) const;
+
+	boost::shared_ptr<Image> crop_scale_window (Crop c, libdcp::Size, libdcp::Size, Scaler const *, AVPixelFormat, bool aligned) const;
 	
 	void make_black ();
+	void alpha_blend (boost::shared_ptr<const Image> image, Position<int> pos);
+	void copy (boost::shared_ptr<const Image> image, Position<int> pos);
 
 	void read_from_socket (boost::shared_ptr<Socket>);
 	void write_to_socket (boost::shared_ptr<Socket>) const;
@@ -72,13 +73,15 @@ public:
 		return _pixel_format;
 	}
 
+	std::string digest () const;
+
 private:
 	friend class pixel_formats_test;
 	
 	void allocate ();
 	void swap (Image &);
 	float bytes_per_pixel (int) const;
-	void yuv_16_black (uint16_t);
+	void yuv_16_black (uint16_t, bool);
 	static uint16_t swap_16 (uint16_t);
 	
 	AVPixelFormat _pixel_format; ///< FFmpeg's way of describing the pixel format of this Image