* @brief ImageProxy and subclasses.
*/
-#include <boost/shared_ptr.hpp>
-#include <boost/filesystem.hpp>
+#include <dcp/types.h>
#include <Magick++.h>
#include <libxml++/libxml++.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/optional.hpp>
+#include <boost/filesystem.hpp>
class Image;
class Socket;
-class Log;
namespace cxml {
class Node;
* of happening in a single-threaded decoder.
*
* For example, large TIFFs are slow to decode, so this class will keep
- * the TIFF data TIFF until such a time that the actual image is needed.
+ * 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
{
public:
- ImageProxy (boost::shared_ptr<Log> log);
virtual ~ImageProxy () {}
/** @return Image (which must be aligned) */
- virtual boost::shared_ptr<Image> image () const = 0;
+ virtual boost::shared_ptr<Image> image (boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> ()) const = 0;
virtual void add_metadata (xmlpp::Node *) const = 0;
virtual void send_binary (boost::shared_ptr<Socket>) const = 0;
-
-protected:
- boost::shared_ptr<Log> _log;
+ /** @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 {
+ return false;
+ }
};
-boost::shared_ptr<ImageProxy> image_proxy_factory (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket, boost::shared_ptr<Log> log);
+boost::shared_ptr<ImageProxy> image_proxy_factory (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
#endif