clean code to export between different flavours, output different code for sgml to...

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

diff --git a/src/graphics/GraphicsCacheItem.C b/src/graphics/GraphicsCacheItem.C
index 9241560176e201d871459d1dfd1fc1f28d715794..59973327d441815b6bbf1ff202eb94fc5f7c8e6c 100644 (file)
--- a/src/graphics/GraphicsCacheItem.C
+++ b/src/graphics/GraphicsCacheItem.C
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Baruch Even
- * \author Herbert Voss
+ * \author Herbert Voß
  * \author Angus Leeming
  *
  * Full author contact details are available in file CREDITS.
@@ -13,24 +13,35 @@
 #include <config.h>
 
 #include "GraphicsCacheItem.h"
-#include "GraphicsImage.h"
 #include "GraphicsConverter.h"
-
-#include "support/FileMonitor.h"
+#include "GraphicsImage.h"
 
 #include "debug.h"
 
-#include "support/LAssert.h"
 #include "support/filetools.h"
+#include "support/FileMonitor.h"
 #include "support/lyxlib.h"
 
-#include <boost/shared_ptr.hpp>
 #include <boost/bind.hpp>
-#include <boost/signals/trackable.hpp>
 
-using namespace lyx::support;
+
+namespace support = lyx::support;
+
+using support::ChangeExtension;
+using support::FileMonitor;
+using support::IsFileReadable;
+using support::MakeDisplayPath;
+using support::OnlyFilename;
+using support::getExtFromContents;
+using support::tempName;
+using support::unlink;
+using support::unzipFile;
+using support::unzippedFileName;
+using support::zippedFile;
 
 using std::endl;
+using std::string;
+
 
 namespace lyx {
 namespace graphics {
@@ -324,7 +335,7 @@ string const findTargetFormat(string const & from)
        FormatList const formats = lyx::graphics::Image::loadableFormats();
 
        // There must be a format to load from.
-       Assert(!formats.empty());
+       BOOST_ASSERT(!formats.empty());
 
        // First ascertain if we can load directly with no conversion
        FormatList::const_iterator it  = formats.begin();
@@ -371,8 +382,19 @@ void CacheItem::Impl::convertToDisplayFormat()
        }
 
        // Make a local copy in case we unzip it
-       string const filename = zippedFile(filename_) ?
-               unzipFile(filename_) : filename_;
+       string filename;
+       if ((zipped_ = zippedFile(filename_))) {
+               unzipped_filename_ = tempName(string(), filename_);
+               if (unzipped_filename_.empty()) {
+                       setStatus(ErrorConverting);
+                       lyxerr[Debug::GRAPHICS]
+                               << "\tCould not create temporary file." << endl;
+                       return;
+               }
+               filename = unzipFile(filename_, unzipped_filename_);
+       } else
+               filename = filename_;
+
        string const displayed_filename = MakeDisplayPath(filename_);
        lyxerr[Debug::GRAPHICS] << "[GrahicsCacheItem::convertToDisplayFormat]\n"
                << "\tAttempting to convert image file: " << filename
@@ -402,6 +424,7 @@ void CacheItem::Impl::convertToDisplayFormat()
        remove_loaded_file_ = true;
 
        // Remove the temp file, we only want the name...
+       // FIXME: This is unsafe!
        unlink(to_file_base);
 
        // Connect a signal to this->imageConverted and pass this signal to