* Licence details can be found in the file COPYING.
*
* \author Baruch Even
- * \author Herbert Voß
+ * \author Herbert Voß
* \author Angus Leeming
*
* Full author contact details are available in file CREDITS.
/**
* 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);
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;
{
LYXERR(Debug::GRAPHICS, "Loading image.");
- image_.reset(Image::newImage());
+ image_.reset(newImage());
bool success = image_->load(file_to_load_);
string const text = success ? "succeeded" : "failed";
status_ = ErrorNoFile;
LYXERR(Debug::GRAPHICS, "\tThe file is not readable");
}
- return true;
+ return false;
}
zipped_ = filename_.isZippedFile();
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 {
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;