X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage.h;h=51d768a13971a9868aaab2e655edd41f58f066f6;hp=73f2313c1a03f297c22960d5ba290aa83d927fb9;hb=ed4fc06db6957b2b63b2400a737f47c18a1003be;hpb=54ef3f25f924a677de0d71e1f773898b56ab5852

diff --git a/src/lib/image.h b/src/lib/image.h
index 73f2313c1..51d768a13 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -41,7 +41,7 @@ class Socket;
 class Image : public boost::enable_shared_from_this<Image>
 {
 public:
-	Image (AVPixelFormat p, dcp::Size s, bool aligned, int extra_pixels = 0);
+	Image (AVPixelFormat p, dcp::Size s, bool aligned);
 	explicit Image (AVFrame *);
 	explicit Image (Image const &);
 	Image (boost::shared_ptr<const Image>, bool);
@@ -83,6 +83,8 @@ public:
 
 	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:
@@ -90,6 +92,7 @@ private:
 
 	void allocate ();
 	void swap (Image &);
+	void make_part_black (int x, int w);
 	void yuv_16_black (uint16_t, bool);
 	static uint16_t swap_16 (uint16_t);
 
@@ -99,7 +102,6 @@ private:
 	int* _line_size; ///< array of sizes of the data in each line, in bytes (without any alignment padding bytes)
 	int* _stride; ///< array of strides for each line, in bytes (including any alignment padding bytes)
 	bool _aligned;
-	int _extra_pixels;
 };
 
 extern PositionImage merge (std::list<PositionImage> images);