#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;
/**
* If no file conversion is needed, then tryDisplayFormat() calls
* loadImage() directly.
- * \return true if a conversion is necessary.
+ * \return true if a conversion is necessary and no error occurred.
*/
bool tryDisplayFormat(FileName & filename, string & from);
bool remove_loaded_file_;
/// The image and its loading status.
- boost::shared_ptr<Image> image_;
+ shared_ptr<Image> image_;
///
ImageStatus status_;
pimpl_->reset();
FileName filename;
string from;
- bool const success = pimpl_->tryDisplayFormat(filename, from);
+ bool const conversion_needed = pimpl_->tryDisplayFormat(filename, from);
+ bool const success = status() == Loaded && !conversion_needed;
if (!success)
pimpl_->reset();
return success;
remove_loaded_file_(false),
status_(WaitingToLoad)
{
- monitor_.connect(boost::bind(&Impl::startLoading, this));
+ monitor_.connect(bind(&Impl::startLoading, this));
}
bool CacheItem::Impl::tryDisplayFormat(FileName & filename, string & from)
{
// First, check that the file exists!
+ filename_.refresh();
if (!filename_.isReadableFile()) {
if (status_ != ErrorNoFile) {
status_ = ErrorNoFile;
LYXERR(Debug::GRAPHICS, "\tThe file is not readable");
}
- return true;
+ return false;
}
- zipped_ = filename_.isZippedFile();
+ zipped_ = formats.isZippedFile(filename_);
if (zipped_) {
unzipped_filename_ = FileName::tempName(
filename_.toFilesystemEncoding());
if (unzipped_filename_.empty()) {
status_ = ErrorConverting;
LYXERR(Debug::GRAPHICS, "\tCould not create temporary file.");
- return true;
+ return false;
}
filename = unzipFile(filename_, unzipped_filename_.toFilesystemEncoding());
} else {
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));
LYXERR(Debug::GRAPHICS, "\tNo conversion needed (from == to)!");
file_to_load_ = filename;
status_ = loadImage() ? Loaded : ErrorLoading;
- return true;
+ return false;
}
if (ConverterCache::get().inCache(filename, to_)) {
LYXERR(Debug::GRAPHICS, "\tNo conversion needed (file in file cache)!");
file_to_load_ = ConverterCache::get().cacheName(filename, to_);
status_ = loadImage() ? Loaded : ErrorLoading;
- return true;
+ return false;
}
- return false;
+ return true;
}
// Make a local copy in case we unzip it
FileName filename;
string from;
- if (tryDisplayFormat(filename, from)) {
+ if (!tryDisplayFormat(filename, from)) {
// The image status has changed, tell it to the outside world.
statusChanged();
return;
// 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();
}