Merge branch 'rowpainter2'

[lyx.git] / src / graphics / GraphicsCacheItem.cpp

diff --git a/src/graphics/GraphicsCacheItem.cpp b/src/graphics/GraphicsCacheItem.cpp
index 7216d5545bf76f1929b7d279c3fb4356808366c2..2e8c415f36b6709d849389281d2a084f6e031a64 100644 (file)
--- a/src/graphics/GraphicsCacheItem.cpp
+++ b/src/graphics/GraphicsCacheItem.cpp
@@ -25,8 +25,10 @@
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/FileMonitor.h"
+#include "support/lassert.h"
 
-#include <boost/bind.hpp>
+#include "support/bind.h"
+#include "support/TempFile.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -44,7 +46,7 @@ public:
        /**
         *  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);
 
@@ -107,7 +109,7 @@ public:
        bool remove_loaded_file_;
 
        /// The image and its loading status.
-       boost::shared_ptr<Image> image_;
+       shared_ptr<Image> image_;
        ///
        ImageStatus status_;
 
@@ -145,7 +147,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;
@@ -207,7 +210,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));
 }
 
 
@@ -233,7 +236,7 @@ void CacheItem::Impl::reset()
        file_to_load_.erase();
        to_.erase();
 
-       if (image_.get())
+       if (image_)
                image_.reset();
 
        status_ = WaitingToLoad;
@@ -314,7 +317,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.
@@ -348,29 +351,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));
@@ -388,16 +398,16 @@ bool CacheItem::Impl::tryDisplayFormat(FileName & filename, string & from)
                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 +418,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 +429,16 @@ 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_.reset(new Converter(filename, to_file_base.absFileName(), from, to_));
+       converter_->connect(bind(&Impl::imageConverted, this, _1));
        converter_->startConversion();
 }