#include "GraphicsCacheItem.h"
+#include "Buffer.h"
#include "GraphicsCache.h"
#include "GraphicsConverter.h"
#include "GraphicsImage.h"
#include "support/filetools.h"
#include "support/FileMonitor.h"
#include "support/lassert.h"
+#include "support/unique_ptr.h"
#include "support/bind.h"
+#include "support/TempFile.h"
using namespace std;
using namespace lyx::support;
namespace graphics {
-class CacheItem::Impl : public boost::signals::trackable {
+class CacheItem::Impl : public boost::signals2::trackable {
public:
///
- Impl(FileName const & file);
+ Impl(FileName const & file, FileName const & doc_file);
/**
* If no file conversion is needed, then tryDisplayFormat() calls
/// The filename we refer too.
FileName const filename_;
+ /// The document filename this graphic item belongs to
+ FileName const & doc_file_;
///
FileMonitor const monitor_;
bool remove_loaded_file_;
/// The image and its loading status.
- shared_ptr<Image> image_;
+ std::shared_ptr<Image> image_;
///
ImageStatus status_;
/// This signal is emitted when the image loading status changes.
- boost::signal<void()> statusChanged;
+ boost::signals2::signal<void()> statusChanged;
/// The connection of the signal ConvProcess::finishedConversion,
- boost::signals::connection cc_;
+ boost::signals2::connection cc_;
///
- boost::scoped_ptr<Converter> converter_;
+ unique_ptr<Converter> converter_;
};
-CacheItem::CacheItem(FileName const & file)
- : pimpl_(new Impl(file))
+CacheItem::CacheItem(FileName const & file, FileName const & doc_file)
+ : pimpl_(new Impl(file,doc_file))
{}
}
-boost::signals::connection CacheItem::connect(slot_type const & slot) const
+boost::signals2::connection CacheItem::connect(slot_type const & slot) const
{
return pimpl_->statusChanged.connect(slot);
}
//------------------------------
-CacheItem::Impl::Impl(FileName const & file)
- : filename_(file),
+CacheItem::Impl::Impl(FileName const & file, FileName const & doc_file)
+ : filename_(file), doc_file_(doc_file),
monitor_(file, 2000),
zipped_(false),
remove_loaded_file_(false),
if (cc_.connected())
cc_.disconnect();
- if (converter_.get())
+ if (converter_)
converter_.reset();
}
string const text = success ? "succeeded" : "failed";
LYXERR(Debug::GRAPHICS, "Image conversion " << text << '.');
- file_to_load_ = converter_.get() ?
- FileName(converter_->convertedFile()) : FileName();
+ file_to_load_ = converter_ ? FileName(converter_->convertedFile())
+ : FileName();
converter_.reset();
cc_.disconnect();
}
-static string const findTargetFormat(string const & from)
-{
- typedef vector<string> FormatList;
- FormatList const & formats = Cache::get().loadableFormats();
+typedef vector<string> FormatList;
+static string const findTargetFormat(FormatList const & formats, string const & from)
+{
// 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.
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.");
LYXERR(Debug::GRAPHICS, "\tCould not determine file format.");
}
LYXERR(Debug::GRAPHICS, "\n\tThe file contains " << from << " format data.");
- to_ = findTargetFormat(from);
+ to_ = findTargetFormat(Cache::get().loadableFormats(), from);
if (from == to_) {
// No conversion needed!
// 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_ = make_unique<Converter>(doc_file_, filename, to_file_base.absFileName(),
+ from, to_);
converter_->connect(bind(&Impl::imageConverted, this, _1));
converter_->startConversion();
}