X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsLoader.cpp;h=c38761c85b7d8b95a693b3e95e205c8d17990369;hb=38c2cde0d8695ac5287bae218c4a33a2acf18ef8;hp=36a6c06d2c12748f2f834612d756c313e984b55d;hpb=2fd2e657458f571df373a1b3fba1e6a33c8f6d59;p=lyx.git

diff --git a/src/graphics/GraphicsLoader.cpp b/src/graphics/GraphicsLoader.cpp
index 36a6c06d2c..c38761c85b 100644
--- a/src/graphics/GraphicsLoader.cpp
+++ b/src/graphics/GraphicsLoader.cpp
@@ -18,6 +18,7 @@
 #include "GraphicsCache.h"
 
 #include "support/debug.h"
+#include "support/lassert.h"
 #include "support/Timeout.h"
 
 #include "support/bind.h"
@@ -30,6 +31,7 @@ using namespace std;
 using namespace lyx::support;
 
 namespace lyx {
+
 namespace graphics {
 
 
@@ -105,16 +107,17 @@ void LoaderQueue::loadNext()
 
 
 LoaderQueue::LoaderQueue() : timer(s_millisecs_, Timeout::ONETIME),
-			     running_(false)
+                             running_(false)
 {
-	timer.timeout.connect(bind(&LoaderQueue::loadNext, this));
+	// Disconnected when this is destroyed
+	timer.timeout.connect([this](){ loadNext(); });
 }
 
 
 void LoaderQueue::startLoader()
 {
 	LYXERR(Debug::GRAPHICS, "LoaderQueue: waking up");
-	running_ = true ;
+	running_ = true;
 	timer.setTimeout(s_millisecs_);
 	timer.start();
 }
@@ -161,10 +164,11 @@ void LoaderQueue::touch(Cache::ItemPtr const & item)
 
 typedef std::shared_ptr<Image> ImagePtr;
 
-class Loader::Impl : public boost::signals2::trackable {
+class Loader::Impl {
+	friend class Loader;
 public:
 	///
-	Impl();
+	Impl(FileName const & doc_file);
 	///
 	~Impl();
 	///
@@ -178,6 +182,8 @@ public:
 	///
 	Params const & params() const { return params_; }
 
+	///
+	FileName doc_file_;
 	/// The loading status of the image.
 	ImageStatus status_;
 	/** Must store a copy of the cached item to ensure that it is not
@@ -187,9 +193,9 @@ public:
 	/// We modify a local copy of the image once it is loaded.
 	ImagePtr image_;
 	/// This signal is emitted when the image loading status changes.
-	boost::signals2::signal<void()> signal_;
-	/// The connection of the signal StatusChanged 	
-	boost::signals2::connection sc_;
+	signals2::signal<void()> signal_;
+	/// The connection of the signal statusChanged
+	signals2::scoped_connection connection_;
 
 	double displayPixelRatio() const
 	{
@@ -211,27 +217,35 @@ private:
 };
 
 
-Loader::Loader()
-	: pimpl_(new Impl)
+Loader::Loader(FileName const & doc_file)
+	: pimpl_(new Impl(doc_file))
 {}
 
 
-Loader::Loader(FileName const & file, bool display)
-	: pimpl_(new Impl)
+Loader::Loader(FileName const & doc_file, FileName const & file, bool display)
+	: pimpl_(new Impl(doc_file))
 {
 	reset(file, display);
 }
 
 
-Loader::Loader(FileName const & file, Params const & params)
-	: pimpl_(new Impl)
+Loader::Loader(FileName const & doc_file, FileName const & file, Params const & params)
+	: pimpl_(new Impl(doc_file))
 {
 	reset(file, params);
 }
 
 
+Loader::Loader(FileName const & doc_file, Loader const & other)
+	: pimpl_(new Impl(doc_file))
+{
+	Params const & params = other.pimpl_->params();
+	reset(params.filename, params);
+}
+
+
 Loader::Loader(Loader const & other)
-	: pimpl_(new Impl)
+	: pimpl_(new Impl(other.pimpl_->doc_file_))
 {
 	Params const & params = other.pimpl_->params();
 	reset(params.filename, params);
@@ -246,7 +260,10 @@ Loader::~Loader()
 
 Loader & Loader::operator=(Loader const & other)
 {
+  LASSERT(false, /**/);
 	if (this != &other) {
+		delete pimpl_;
+		pimpl_ = new Impl(other.pimpl_->doc_file_);
 		Params const & params = other.pimpl_->params();
 		reset(params.filename, params);
 	}
@@ -282,13 +299,14 @@ void Loader::reset(Params const & params) const
 
 void Loader::startLoading() const
 {
-	if (pimpl_->status_ != WaitingToLoad || !pimpl_->cached_item_)
+	if (pimpl_->status_ != WaitingToLoad || !pimpl_->cached_item_
+	    || pimpl_->cached_item_->status() == Converting)
 		return;
 	pimpl_->startLoading();
 }
 
 
-void Loader::reload() const 
+void Loader::reload() const
 {
 	pimpl_->cached_item_->startLoading();
 }
@@ -312,12 +330,12 @@ bool Loader::monitoring() const
 }
 
 
-unsigned long Loader::checksum() const
+void Loader::checkModifiedAsync() const
 {
 	if (!pimpl_->cached_item_)
-		return 0;
+		return;
 
-	return pimpl_->cached_item_->checksum();
+	pimpl_->cached_item_->checkModifiedAsync();
 }
 
 
@@ -347,7 +365,7 @@ void Loader::setDisplayPixelRatio(double scale)
 }
 
 
-boost::signals2::connection Loader::connect(slot_type const & slot) const
+signals2::connection Loader::connect(slot const & slot) const
 {
 	return pimpl_->signal_.connect(slot);
 }
@@ -359,8 +377,8 @@ Image const * Loader::image() const
 }
 
 
-Loader::Impl::Impl()
-	: status_(WaitingToLoad)
+Loader::Impl::Impl(FileName const & doc_file)
+	: doc_file_(doc_file), status_(WaitingToLoad)
 {
 }
 
@@ -387,7 +405,12 @@ void Loader::Impl::resetFile(FileName const & file)
 		continue_monitoring = cached_item_->monitoring();
 		// cached_item_ is going to be reset, so the connected
 		// signal needs to be disconnected.
-		sc_.disconnect();
+		try {
+			// This can in theory throw a BufferException
+			connection_.disconnect();
+		} catch (...) {
+			LYXERR(Debug::GRAPHICS, "Unable to disconnect signal.");
+		}
 		cached_item_.reset();
 		if (status_ != Converting) {
 			Cache::get().remove(old_file);
@@ -404,7 +427,7 @@ void Loader::Impl::resetFile(FileName const & file)
 
 	Cache & gc = Cache::get();
 	if (!gc.inCache(file))
-		gc.add(file);
+		gc.add(file, doc_file_);
 
 	// We /must/ make a local copy of this.
 	cached_item_ = gc.item(file);
@@ -413,7 +436,8 @@ void Loader::Impl::resetFile(FileName const & file)
 	if (continue_monitoring && !cached_item_->monitoring())
 		cached_item_->startMonitoring();
 
-	sc_ = cached_item_->connect(bind(&Impl::statusChanged, this));
+	// This is a scoped connection
+	connection_ = cached_item_->connect([this](){ statusChanged(); });
 }