Correct the mess introduced in r33250.

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

diff --git a/src/graphics/GraphicsCacheItem.cpp b/src/graphics/GraphicsCacheItem.cpp
index 40de5402f49378083f359c3c3dd25ac86bdae521..4c047079759a9919f645a573c4de3bc8e2800c68 100644 (file)
--- 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.
@@ -44,7 +44,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);
 
@@ -145,7 +145,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;
@@ -291,7 +292,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";
@@ -319,7 +320,7 @@ static string const findTargetFormat(string const & from)
        // Use the standard converter if we don't know the format to load
        // from.
        if (from.empty())
-               return string("png");
+               return string("ppm");
 
        // First ascertain if we can load directly with no conversion
        FormatList::const_iterator it  = formats.begin();
@@ -341,19 +342,20 @@ static string const findTargetFormat(string const & from)
 
        // Failed! so we have to try to convert it to PPM format
        // with the standard converter
-       return string("png");
+       return string("ppm");
 }
 
 
 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();
@@ -363,7 +365,7 @@ bool CacheItem::Impl::tryDisplayFormat(FileName & filename, string & from)
                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 {
@@ -388,16 +390,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 +410,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;
@@ -422,10 +424,6 @@ void CacheItem::Impl::convertToDisplayFormat()
        FileName const to_file_base = FileName::tempName("CacheItem");
        remove_loaded_file_ = true;
 
-       // Remove the temp file, we only want the name...
-       // FIXME: This is unsafe!
-       to_file_base.removeFile();
-
        // 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.