merge recent changes from master

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

diff --git a/src/graphics/PreviewImage.cpp b/src/graphics/PreviewImage.cpp
index 661c8af8d19f947ac5216a4f2e2a2c252f8999bc..da0f1e21ceeb942207dd91152c937ef70a6d10a0 100644 (file)
--- a/src/graphics/PreviewImage.cpp
+++ b/src/graphics/PreviewImage.cpp
@@ -28,7 +28,7 @@ using namespace lyx::support;
 namespace lyx {
 namespace graphics {
 
-class PreviewImage::Impl : public boost::signals::trackable {
+class PreviewImage::Impl : public boost::signals2::trackable {
 public:
        ///
        Impl(PreviewImage & p, PreviewLoader & l,
@@ -99,11 +99,17 @@ Image const * PreviewImage::image() const
 }
 
 
+PreviewLoader & PreviewImage::previewLoader() const
+{
+       return pimpl_->ploader_;
+}
+
+
 PreviewImage::Impl::Impl(PreviewImage & p, PreviewLoader & l,
                         string const & s,
                         FileName const & bf,
                         double af)
-       : parent_(p), ploader_(l), iloader_(bf),
+       : parent_(p), ploader_(l), iloader_(l.buffer().fileName(), bf),
          snippet_(s), ascent_frac_(af)
 {
        iloader_.setDisplayPixelRatio(l.displayPixelRatio());
@@ -113,6 +119,9 @@ PreviewImage::Impl::Impl(PreviewImage & p, PreviewLoader & l,
 
 PreviewImage::Impl::~Impl()
 {
+       // If these images are generated for a clone, then that may be
+       // because we are previewing. We therefore do not want to delete
+       // them when this Buffer is destroyed.
        if (!ploader_.buffer().isClone())
                iloader_.filename().removeFile();
 }