#include "GraphicsImage.h"
#include "debug.h"
+#include "format.h"
#include "support/filetools.h"
#include "support/FileMonitor.h"
-#include "support/LAssert.h"
#include "support/lyxlib.h"
#include <boost/bind.hpp>
+
namespace support = lyx::support;
-using support::Assert;
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 {
-struct CacheItem::Impl : public boost::signals::trackable {
+class CacheItem::Impl : public boost::signals::trackable {
+public:
///
Impl(string const & file);
ImageStatus status_;
/// This signal is emitted when the image loading status changes.
- boost::signal0<void> statusChanged;
+ boost::signal<void()> statusChanged;
/// The connection to the signal Image::finishedLoading
boost::signals::connection cl_;
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();
}
// 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
<< "\n\twith displayed filename: " << displayed_filename
<< endl;
- string from = getExtFromContents(filename);
+ string const from = formats.getFormatFromFile(filename);
+ if (from.empty()) {
+ setStatus(ErrorConverting);
+ lyxerr[Debug::GRAPHICS]
+ << "\tCould not determine file format." << endl;
+ return;
+ }
lyxerr[Debug::GRAPHICS]
<< "\n\tThe file contains " << from << " format data." << endl;
string const to = findTargetFormat(from);
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