X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsLoader.cpp;h=4ec5c9aed92f50a3443a82741f9429bfa0eab199;hb=f887efedf11c198d9b6cc19911fa0a32a93496f3;hp=b25d2d1c013e17e7137252604a745c9c0a979b43;hpb=9abb7db46800e554f57e865a3e768602ffd9d6f1;p=lyx.git

diff --git a/src/graphics/GraphicsLoader.cpp b/src/graphics/GraphicsLoader.cpp
index b25d2d1c01..4ec5c9aed9 100644
--- a/src/graphics/GraphicsLoader.cpp
+++ b/src/graphics/GraphicsLoader.cpp
@@ -16,11 +16,11 @@
 #include "GraphicsImage.h"
 #include "GraphicsParams.h"
 #include "GraphicsCache.h"
-#include "support/debug.h"
 
+#include "support/debug.h"
 #include "support/Timeout.h"
 
-#include <boost/bind.hpp>
+#include "support/bind.h"
 
 #include <set>
 #include <queue>
@@ -74,6 +74,7 @@ private:
 //static int s_numimages_ = 5;
 //static int s_millisecs_ = 500;
 
+// FIXME THREAD
 static int s_numimages_ = 10;
 static int s_millisecs_ = 500;
 
@@ -89,25 +90,24 @@ void LoaderQueue::loadNext()
 	LYXERR(Debug::GRAPHICS, "LoaderQueue: "
 		<< cache_queue_.size() << " items in the queue");
 	int counter = s_numimages_;
-	while (cache_queue_.size() && counter--) {
+	while (!cache_queue_.empty() && counter--) {
 		Cache::ItemPtr ptr = cache_queue_.front();
 		cache_set_.erase(ptr);
 		cache_queue_.pop_front();
 		if (ptr->status() == WaitingToLoad)
 			ptr->startLoading();
 	}
-	if (cache_queue_.size()) {
+	if (!cache_queue_.empty())
 		startLoader();
-	} else {
+	else
 		stopLoader();
-	}
 }
 
 
 LoaderQueue::LoaderQueue() : timer(s_millisecs_, Timeout::ONETIME),
 			     running_(false)
 {
-	timer.timeout.connect(boost::bind(&LoaderQueue::loadNext, this));
+	timer.timeout.connect(bind(&LoaderQueue::loadNext, this));
 }
 
 
@@ -159,7 +159,7 @@ void LoaderQueue::touch(Cache::ItemPtr const & item)
 //
 /////////////////////////////////////////////////////////////////////
 
-typedef boost::shared_ptr<Image> ImagePtr;
+typedef shared_ptr<Image> ImagePtr;
 
 class Loader::Impl : public boost::signals::trackable {
 public:
@@ -207,10 +207,10 @@ Loader::Loader()
 {}
 
 
-Loader::Loader(FileName const & file, DisplayType type)
+Loader::Loader(FileName const & file, bool display)
 	: pimpl_(new Impl)
 {
-	reset(file, type);
+	reset(file, display);
 }
 
 
@@ -245,10 +245,10 @@ Loader & Loader::operator=(Loader const & other)
 }
 
 
-void Loader::reset(FileName const & file, DisplayType type) const
+void Loader::reset(FileName const & file, bool display) const
 {
 	Params params;
-	params.display = type;
+	params.display = display;
 	pimpl_->resetParams(params);
 
 	pimpl_->resetFile(file);
@@ -273,15 +273,21 @@ void Loader::reset(Params const & params) const
 
 void Loader::startLoading() const
 {
-	if (pimpl_->status_ != WaitingToLoad || !pimpl_->cached_item_.get())
+	if (pimpl_->status_ != WaitingToLoad || !pimpl_->cached_item_)
 		return;
 	pimpl_->startLoading();
 }
 
 
+void Loader::reload() const 
+{
+	pimpl_->cached_item_->startLoading();
+}
+
+
 void Loader::startMonitoring() const
 {
-	if (!pimpl_->cached_item_.get())
+	if (!pimpl_->cached_item_)
 		return;
 
 	pimpl_->cached_item_->startMonitoring();
@@ -290,7 +296,7 @@ void Loader::startMonitoring() const
 
 bool Loader::monitoring() const
 {
-	if (!pimpl_->cached_item_.get())
+	if (!pimpl_->cached_item_)
 		return false;
 
 	return pimpl_->cached_item_->monitoring();
@@ -299,7 +305,7 @@ bool Loader::monitoring() const
 
 unsigned long Loader::checksum() const
 {
-	if (!pimpl_->cached_item_.get())
+	if (!pimpl_->cached_item_)
 		return 0;
 
 	return pimpl_->cached_item_->checksum();
@@ -309,7 +315,7 @@ unsigned long Loader::checksum() const
 FileName const & Loader::filename() const
 {
 	static FileName const empty;
-	return pimpl_->cached_item_.get() ?
+	return pimpl_->cached_item_ ?
 		pimpl_->cached_item_->filename() : empty;
 }
 
@@ -346,7 +352,7 @@ Loader::Impl::~Impl()
 
 void Loader::Impl::resetFile(FileName const & file)
 {
-	FileName const old_file = cached_item_.get() ?
+	FileName const old_file = cached_item_ ?
 		cached_item_->filename() : FileName();
 
 	if (file == old_file)
@@ -362,13 +368,17 @@ void Loader::Impl::resetFile(FileName const & file)
 		// signal needs to be disconnected.
 		sc_.disconnect();
 		cached_item_.reset();
-		Cache::get().remove(old_file);
+		if (status_ != Converting) {
+			Cache::get().remove(old_file);
+		} else {
+			//TODO remove cache item when it is not busy any more, see #7163
+		}
 	}
 
-	status_ = cached_item_.get() ? cached_item_->status() : WaitingToLoad;
+	status_ = cached_item_ ? cached_item_->status() : WaitingToLoad;
 	image_.reset();
 
-	if (cached_item_.get() || file.empty())
+	if (cached_item_ || file.empty())
 		return;
 
 	Cache & gc = Cache::get();
@@ -382,7 +392,7 @@ void Loader::Impl::resetFile(FileName const & file)
 	if (continue_monitoring && !cached_item_->monitoring())
 		cached_item_->startMonitoring();
 
-	sc_ = cached_item_->connect(boost::bind(&Impl::statusChanged, this));
+	sc_ = cached_item_->connect(bind(&Impl::statusChanged, this));
 }
 
 
@@ -392,14 +402,14 @@ void Loader::Impl::resetParams(Params const & params)
 		return;
 
 	params_ = params;
-	status_ = cached_item_.get() ? cached_item_->status() : WaitingToLoad;
+	status_ = cached_item_ ? cached_item_->status() : WaitingToLoad;
 	image_.reset();
 }
 
 
 void Loader::Impl::statusChanged()
 {
-	status_ = cached_item_.get() ? cached_item_->status() : WaitingToLoad;
+	status_ = cached_item_ ? cached_item_->status() : WaitingToLoad;
 	createPixmap();
 	signal_();
 }
@@ -407,16 +417,21 @@ void Loader::Impl::statusChanged()
 
 void Loader::Impl::createPixmap()
 {
-	if (!cached_item_.get() ||
-	    params_.display == NoDisplay || status_ != Loaded)
+	if (!params_.display || status_ != Loaded)
 		return;
 
-	image_.reset(cached_item_->image()->clone());
+	if (!cached_item_) {
+		LYXERR(Debug::GRAPHICS, "pixmap not cached yet");
+		return;
+	}
 
-	// These do nothing if there's nothing to do
-	image_->clip(params_);
-	image_->rotate(params_);
-	image_->scale(params_);
+	if (!cached_item_->image()) {
+		// There must have been a problem reading the file.
+		LYXERR(Debug::GRAPHICS, "Graphics file not loaded.");
+		return;
+	}
+
+	image_.reset(cached_item_->image()->clone());
 
 	bool const success = image_->setPixmap(params_);
 
@@ -433,6 +448,12 @@ void Loader::Impl::startLoading()
 	if (status_ != WaitingToLoad)
 		return;
 
+	if (cached_item_->tryDisplayFormat()) {
+		status_ = Loaded;
+		createPixmap();
+		return;
+	}
+
 	LoaderQueue::get().touch(cached_item_);
 }