X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsCacheItem.cpp;h=4939874ab3b8512f9d6282a5595e17fe0b0628af;hb=f887efedf11c198d9b6cc19911fa0a32a93496f3;hp=0bac4b559ea801e694dea2de52467a861cef82dc;hpb=d757c34e79fa0a4c692bd395c9d497819b3b5735;p=lyx.git

diff --git a/src/graphics/GraphicsCacheItem.cpp b/src/graphics/GraphicsCacheItem.cpp
index 0bac4b559e..4939874ab3 100644
--- a/src/graphics/GraphicsCacheItem.cpp
+++ b/src/graphics/GraphicsCacheItem.cpp
@@ -25,8 +25,9 @@
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/FileMonitor.h"
+#include "support/lassert.h"
 
-#include <boost/bind.hpp>
+#include "support/bind.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -107,7 +108,7 @@ public:
 	bool remove_loaded_file_;
 
 	/// The image and its loading status.
-	boost::shared_ptr<Image> image_;
+	shared_ptr<Image> image_;
 	///
 	ImageStatus status_;
 
@@ -208,7 +209,7 @@ CacheItem::Impl::Impl(FileName const & file)
 	  remove_loaded_file_(false),
 	  status_(WaitingToLoad)
 {
-	monitor_.connect(boost::bind(&Impl::startLoading, this));
+	monitor_.connect(bind(&Impl::startLoading, this));
 }
 
 
@@ -234,7 +235,7 @@ void CacheItem::Impl::reset()
 	file_to_load_.erase();
 	to_.erase();
 
-	if (image_.get())
+	if (image_)
 		image_.reset();
 
 	status_ = WaitingToLoad;
@@ -315,7 +316,7 @@ static string const findTargetFormat(string const & from)
 	FormatList const & formats = Cache::get().loadableFormats();
 
 	 // There must be a format to load from.
-	LASSERT(!formats.empty(), /**/);
+	LASSERT(!formats.empty(), return string());
 
 	// Use the standard converter if we don't know the format to load
 	// from.
@@ -349,6 +350,7 @@ static string const findTargetFormat(string const & from)
 bool CacheItem::Impl::tryDisplayFormat(FileName & filename, string & from)
 {
 	// First, check that the file exists!
+	filename_.refresh();
 	if (!filename_.isReadableFile()) {
 		if (status_ != ErrorNoFile) {
 			status_ = ErrorNoFile;
@@ -357,7 +359,7 @@ bool CacheItem::Impl::tryDisplayFormat(FileName & filename, string & from)
 		return false;
 	}
 
-	zipped_ = filename_.isZippedFile();
+	zipped_ = formats.isZippedFile(filename_);
 	if (zipped_) {
 		unzipped_filename_ = FileName::tempName(
 			filename_.toFilesystemEncoding());
@@ -371,7 +373,7 @@ bool CacheItem::Impl::tryDisplayFormat(FileName & filename, string & from)
 		filename = filename_;
 	}
 
-	docstring const displayed_filename = makeDisplayPath(filename_.absFilename());
+	docstring const displayed_filename = makeDisplayPath(filename_.absFileName());
 	LYXERR(Debug::GRAPHICS, "[CacheItem::Impl::convertToDisplayFormat]\n"
 		<< "\tAttempting to convert image file: " << filename
 		<< "\n\twith displayed filename: " << to_utf8(displayed_filename));
@@ -426,8 +428,8 @@ void CacheItem::Impl::convertToDisplayFormat()
 	// Connect a signal to this->imageConverted and pass this signal to
 	// the graphics converter so that we can load the modified file
 	// on completion of the conversion process.
-	converter_.reset(new Converter(filename, to_file_base.absFilename(), from, to_));
-	converter_->connect(boost::bind(&Impl::imageConverted, this, _1));
+	converter_.reset(new Converter(filename, to_file_base.absFileName(), from, to_));
+	converter_->connect(bind(&Impl::imageConverted, this, _1));
 	converter_->startConversion();
 }