X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsCacheItem.C;h=59973327d441815b6bbf1ff202eb94fc5f7c8e6c;hb=33243f70037b067f90d1574b74b34f90a2ef2aa1;hp=798977f2b4722e3b794fba05899fbab000eb1568;hpb=fe390e9da1538e20eabbc98977d845295f8e563d;p=lyx.git

diff --git a/src/graphics/GraphicsCacheItem.C b/src/graphics/GraphicsCacheItem.C
index 798977f2b4..59973327d4 100644
--- a/src/graphics/GraphicsCacheItem.C
+++ b/src/graphics/GraphicsCacheItem.C
@@ -4,33 +4,44 @@
  * 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
+ * Full author contact details are available in file CREDITS.
  */
 
 #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 {
@@ -68,7 +79,7 @@ struct CacheItem::Impl : public boost::signals::trackable {
 
 	/** Get a notification when the image loading is done.
 	 *  Connected to a signal on_finish_ which is passed to
-	 *  grfx::Image::loadImage.
+	 *  lyx::graphics::Image::loadImage.
 	 */
 	void imageLoaded(bool);
 
@@ -318,15 +329,13 @@ void CacheItem::Impl::imageLoaded(bool success)
 
 namespace {
 
-namespace grfx = lyx::graphics;
-
 string const findTargetFormat(string const & from)
 {
-	typedef grfx::Image::FormatList FormatList;
-	FormatList const formats = grfx::Image::loadableFormats();
+	typedef lyx::graphics::Image::FormatList FormatList;
+	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();
@@ -339,7 +348,7 @@ string const findTargetFormat(string const & from)
 	// So, we have to convert to a loadable format. Can we?
 	it = formats.begin();
 	for (; it != end; ++it) {
-		if (grfx::Converter::isReachable(from, *it))
+		if (lyx::graphics::Converter::isReachable(from, *it))
 			return *it;
 		else
 			lyxerr[Debug::GRAPHICS]
@@ -373,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
@@ -404,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