Remove Image::clone in favour of a copy constructor for SimpleImage; clean up A/B transcoder slightly; fix combiner if image strides differ; try to fix problems when destroying Encoders; fix SimpleImage copy constructor to cope with aligned images; don't call encoder::process_end if the encode throws an exception.

1 files changed, 1 insertions, 6 deletions

diff --git a/src/lib/image.h b/src/lib/image.h
index 31035d272..62961a92e 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -70,8 +70,6 @@ public:
 
 	virtual bool aligned () const = 0;
 
-	virtual boost::shared_ptr<Image> clone () const = 0;
-
 	int components () const;
 	int lines (int) const;
 
@@ -120,9 +118,6 @@ private:
 	/* Not allowed */
 	FilterBufferImage (FilterBufferImage const &);
 	FilterBufferImage& operator= (FilterBufferImage const &);
-	boost::shared_ptr<Image> clone () const {
-		assert (false);
-	}
 	
 	AVFilterBufferRef* _buffer;
 	int* _line_size;
@@ -136,6 +131,7 @@ class SimpleImage : public Image
 public:
 	SimpleImage (AVPixelFormat, libdcp::Size, bool);
 	SimpleImage (SimpleImage const &);
+	SimpleImage (boost::shared_ptr<const Image>);
 	SimpleImage& operator= (SimpleImage const &);
 	~SimpleImage ();
 
@@ -144,7 +140,6 @@ public:
 	int * stride () const;
 	libdcp::Size size () const;
 	bool aligned () const;
-	boost::shared_ptr<Image> clone () const;
 
 protected:
 	void allocate ();