X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_proxy.h;h=a37be580fcf062fbb247e1d02285e532d49279da;hb=68798e3ed491d642bb52e3d70dbe9c204aeb614b;hp=9619fab75d345fe53b3ad278d4466756dc5dbcd0;hpb=3b31d2d8a129ae6d8d267427bd6b5bc444b40b2a;p=dcpomatic.git

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index 9619fab75..a37be580f 100644
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,21 +18,25 @@
 
 */
 
+
 #ifndef DCPOMATIC_IMAGE_PROXY_H
 #define DCPOMATIC_IMAGE_PROXY_H
 
+
 /** @file  src/lib/image_proxy.h
  *  @brief ImageProxy and subclasses.
  */
 
+
+#include "image.h"
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
 #include <dcp/types.h>
-#include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 #include <boost/utility.hpp>
 
+
 class Image;
 class Socket;
 
@@ -44,6 +48,7 @@ namespace cxml {
 	class Node;
 }
 
+
 /** @class ImageProxy
  *  @brief A class which holds an Image, and can produce it on request.
  *
@@ -55,24 +60,36 @@ namespace cxml {
  *  the TIFF data compressed until the decompressed image is needed.
  *  At this point, the class decodes the TIFF to an Image.
  */
-class ImageProxy : public boost::noncopyable
+class ImageProxy
 {
 public:
+	ImageProxy () {}
 	virtual ~ImageProxy () {}
 
+	ImageProxy (ImageProxy const&) = delete;
+	ImageProxy& operator= (ImageProxy const&) = delete;
+
 	struct Result {
-		Result (boost::shared_ptr<Image> image_, int log2_scaling_)
+		Result (std::shared_ptr<const Image> image_, int log2_scaling_)
 			: image (image_)
 			, log2_scaling (log2_scaling_)
+			, error (false)
 		{}
 
-		/** Image (which will be aligned) */
-		boost::shared_ptr<Image> image;
+		Result (std::shared_ptr<Image> image_, int log2_scaling_, bool error_)
+			: image (image_)
+			, log2_scaling (log2_scaling_)
+			, error (error_)
+		{}
+
+		std::shared_ptr<const Image> image;
 		/** log2 of any scaling down that has already been applied to the image;
 		 *  e.g. if the image is already half the size of the original, this value
 		 *  will be 1.
 		 */
 		int log2_scaling;
+		/** true if there was an error during image decoding, otherwise false */
+		bool error;
 	};
 
 	/** @param log Log to write to, or 0.
@@ -80,21 +97,24 @@ public:
 	 *  can be used as an optimisation.
 	 */
 	virtual Result image (
+		Image::Alignment alignment,
 		boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
 		) const = 0;
 
 	virtual void add_metadata (xmlpp::Node *) const = 0;
-	virtual void send_binary (boost::shared_ptr<Socket>) const = 0;
+	virtual void write_to_socket (std::shared_ptr<Socket>) const = 0;
 	/** @return true if our image is definitely the same as another, false if it is probably not */
-	virtual bool same (boost::shared_ptr<const ImageProxy>) const = 0;
+	virtual bool same (std::shared_ptr<const ImageProxy>) const = 0;
 	/** Do any useful work that would speed up a subsequent call to ::image().
 	 *  This method may be called in a different thread to image().
 	 *  @return log2 of any scaling down that will be applied to the image.
 	 */
-	virtual int prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const { return 0; }
+	virtual int prepare (Image::Alignment, boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const { return 0; }
 	virtual size_t memory_used () const = 0;
 };
 
-boost::shared_ptr<ImageProxy> image_proxy_factory (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
+
+std::shared_ptr<ImageProxy> image_proxy_factory (std::shared_ptr<cxml::Node> xml, std::shared_ptr<Socket> socket);
+
 
 #endif