Lots of #include <iostream>s for Arch.

[dcpomatic.git] / src / lib / magick_image_proxy.cc

diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index e71ee4284f041d5c1acb2154e8896dcaf885b7f7..5a0ce94bf743ee5a205e1e2a350e4f5d8ae4c63b 100644 (file)
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,36 +17,40 @@
 
 */
 
-#include <Magick++.h>
 #include "magick_image_proxy.h"
 #include "cross.h"
 #include "exceptions.h"
-#include "util.h"
+#include "dcpomatic_socket.h"
 #include "image.h"
+#include "compose.hpp"
+#include <Magick++.h>
+#include <libxml++/libxml++.h>
+#include <iostream>
 
 #include "i18n.h"
 
 using std::string;
 using std::cout;
 using boost::shared_ptr;
+using boost::optional;
 using boost::dynamic_pointer_cast;
 
 MagickImageProxy::MagickImageProxy (boost::filesystem::path path)
 {
        /* Read the file into a Blob */
-       
+
        boost::uintmax_t const size = boost::filesystem::file_size (path);
        FILE* f = fopen_boost (path, "rb");
        if (!f) {
                throw OpenFileError (path);
        }
-               
+
        uint8_t* data = new uint8_t[size];
        if (fread (data, 1, size, f) != size) {
                delete[] data;
                throw ReadFileError (path);
        }
-       
+
        fclose (f);
        _blob.update (data, size);
        delete[] data;
@@ -62,8 +66,10 @@ MagickImageProxy::MagickImageProxy (shared_ptr<cxml::Node>, shared_ptr<Socket> s
 }
 
 shared_ptr<Image>
-MagickImageProxy::image () const
+MagickImageProxy::image (optional<dcp::NoteHandler>) const
 {
+       boost::mutex::scoped_lock lm (_mutex);
+
        if (_image) {
                return _image;
        }
@@ -106,7 +112,7 @@ MagickImageProxy::image () const
                using namespace MagickCore;
 #else
                using namespace MagickLib;
-#endif         
+#endif
                magick_image->write (0, i, size.width, 1, "RGB", CharPixel, p);
                p += _image->stride()[0];
        }
@@ -140,6 +146,6 @@ MagickImageProxy::same (shared_ptr<const ImageProxy> other) const
        if (_blob.length() != mp->_blob.length()) {
                return false;
        }
-       
+
        return memcmp (_blob.data(), mp->_blob.data(), _blob.length()) == 0;
 }