X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsCacheItem.cpp;h=c698168dee0c22a67e47eb7528e07b0f02d9a12f;hb=425c190d623daeb6d05bce1aa2244b548225305a;hp=ff83f6f7d23ccb96b3a4fd9dc19c3ce789cf035d;hpb=8195925175605a47d55f53a4d313ccf48a6b29d1;p=lyx.git diff --git a/src/graphics/GraphicsCacheItem.cpp b/src/graphics/GraphicsCacheItem.cpp index ff83f6f7d2..c698168dee 100644 --- a/src/graphics/GraphicsCacheItem.cpp +++ b/src/graphics/GraphicsCacheItem.cpp @@ -4,7 +4,7 @@ * 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. @@ -14,6 +14,7 @@ #include "GraphicsCacheItem.h" +#include "Buffer.h" #include "GraphicsCache.h" #include "GraphicsConverter.h" #include "GraphicsImage.h" @@ -25,8 +26,11 @@ #include "support/FileName.h" #include "support/filetools.h" #include "support/FileMonitor.h" +#include "support/lassert.h" +#include "support/unique_ptr.h" -#include +#include "support/bind.h" +#include "support/TempFile.h" using namespace std; using namespace lyx::support; @@ -35,16 +39,16 @@ namespace lyx { namespace graphics { -class CacheItem::Impl : public boost::signals::trackable { +class CacheItem::Impl : public boost::signals2::trackable { public: /// - Impl(FileName const & file); + Impl(FileName const & file, FileName const & doc_file); /** * 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); @@ -90,6 +94,8 @@ public: /// The filename we refer too. FileName const filename_; + /// The document filename this graphic item belongs to + FileName const & doc_file_; /// FileMonitor const monitor_; @@ -107,23 +113,23 @@ public: bool remove_loaded_file_; /// The image and its loading status. - boost::shared_ptr image_; + std::shared_ptr image_; /// ImageStatus status_; /// This signal is emitted when the image loading status changes. - boost::signal statusChanged; + boost::signals2::signal statusChanged; /// The connection of the signal ConvProcess::finishedConversion, - boost::signals::connection cc_; + boost::signals2::connection cc_; /// - boost::scoped_ptr converter_; + unique_ptr converter_; }; -CacheItem::CacheItem(FileName const & file) - : pimpl_(new Impl(file)) +CacheItem::CacheItem(FileName const & file, FileName const & doc_file) + : pimpl_(new Impl(file,doc_file)) {} @@ -145,7 +151,8 @@ bool CacheItem::tryDisplayFormat() const 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; @@ -189,7 +196,7 @@ ImageStatus CacheItem::status() const } -boost::signals::connection CacheItem::connect(slot_type const & slot) const +boost::signals2::connection CacheItem::connect(slot_type const & slot) const { return pimpl_->statusChanged.connect(slot); } @@ -200,14 +207,14 @@ boost::signals::connection CacheItem::connect(slot_type const & slot) const //------------------------------ -CacheItem::Impl::Impl(FileName const & file) - : filename_(file), +CacheItem::Impl::Impl(FileName const & file, FileName const & doc_file) + : filename_(file), doc_file_(doc_file), monitor_(file, 2000), zipped_(false), remove_loaded_file_(false), status_(WaitingToLoad) { - monitor_.connect(boost::bind(&Impl::startLoading, this)); + monitor_.connect(bind(&Impl::startLoading, this)); } @@ -233,7 +240,7 @@ void CacheItem::Impl::reset() file_to_load_.erase(); to_.erase(); - if (image_.get()) + if (image_) image_.reset(); status_ = WaitingToLoad; @@ -241,7 +248,7 @@ void CacheItem::Impl::reset() if (cc_.connected()) cc_.disconnect(); - if (converter_.get()) + if (converter_) converter_.reset(); } @@ -261,8 +268,8 @@ void CacheItem::Impl::imageConverted(bool success) string const text = success ? "succeeded" : "failed"; LYXERR(Debug::GRAPHICS, "Image conversion " << text << '.'); - file_to_load_ = converter_.get() ? - FileName(converter_->convertedFile()) : FileName(); + file_to_load_ = converter_ ? FileName(converter_->convertedFile()) + : FileName(); converter_.reset(); cc_.disconnect(); @@ -291,7 +298,7 @@ bool CacheItem::Impl::loadImage() { 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"; @@ -308,13 +315,12 @@ bool CacheItem::Impl::loadImage() } -static string const findTargetFormat(string const & from) -{ - typedef vector FormatList; - FormatList const & formats = Cache::get().loadableFormats(); +typedef vector FormatList; +static string const findTargetFormat(FormatList const & formats, string const & from) +{ // 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. @@ -348,29 +354,36 @@ 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; 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()); + string tempname = unzippedFileName(filename_.toFilesystemEncoding()); + string const ext = getExtension(tempname); + tempname = changeExtension(tempname, "") + "-XXXXXX"; + if (!ext.empty()) + tempname = addExtension(tempname, ext); + TempFile tempfile(tempname); + tempfile.setAutoRemove(false); + unzipped_filename_ = tempfile.name(); 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)); @@ -381,23 +394,23 @@ bool CacheItem::Impl::tryDisplayFormat(FileName & filename, string & from) LYXERR(Debug::GRAPHICS, "\tCould not determine file format."); } LYXERR(Debug::GRAPHICS, "\n\tThe file contains " << from << " format data."); - to_ = findTargetFormat(from); + to_ = findTargetFormat(Cache::get().loadableFormats(), from); if (from == to_) { // No conversion needed! 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; } @@ -408,7 +421,7 @@ void CacheItem::Impl::convertToDisplayFormat() // 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; @@ -419,14 +432,17 @@ void CacheItem::Impl::convertToDisplayFormat() // Add some stuff to create a uniquely named temporary file. // This file is deleted in loadImage after it is loaded into memory. - FileName const to_file_base = FileName::tempName("CacheItem"); + TempFile tempfile("CacheItem"); + tempfile.setAutoRemove(false); + FileName const to_file_base = tempfile.name(); remove_loaded_file_ = true; // 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_ = make_unique(doc_file_, filename, to_file_base.absFileName(), + from, to_); + converter_->connect(bind(&Impl::imageConverted, this, _1)); converter_->startConversion(); }