Remove all BufferParam arguments in InsetXXX methods (since insets know about their...

[lyx.git] / src / insets / RenderPreview.cpp

diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index cc4fe5ed93ca05c55aac5b3d83c29ca94dfb1644..c9086d5282a28a98196699896a5eb460250fa69d 100644 (file)
--- a/src/insets/RenderPreview.cpp
+++ b/src/insets/RenderPreview.cpp
@@ -15,7 +15,6 @@
 
 #include "BufferView.h"
 #include "Dimension.h"
-#include "gettext.h"
 #include "LyX.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
@@ -28,17 +27,17 @@
 #include "graphics/Previews.h"
 
 #include "support/FileName.h"
+#include "support/gettext.h"
+#include "support/lassert.h"
 #include "support/lstrings.h"
 
 #include <boost/bind.hpp>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-
-using std::string;
-
 
 LyXRC_PreviewStatus RenderPreview::status()
 {
@@ -62,8 +61,8 @@ RenderPreview::RenderPreview(RenderPreview const & other,
 
 RenderPreview::~RenderPreview()
 {
-       if (ploader_connection_.connected())
-               ploader_connection_.disconnect();
+       if (ploader_connection_.connected())
+               ploader_connection_.disconnect();
 }
 
 
@@ -77,14 +76,13 @@ namespace {
 
 graphics::PreviewLoader & getPreviewLoader(Buffer const & buffer)
 {
-       graphics::Previews const & previews = graphics::Previews::get();
-       return previews.loader(buffer);
+       return thePreviews().loader(buffer);
 }
 
 
 docstring const statusMessage(BufferView const * bv, string const & snippet)
 {
-       BOOST_ASSERT(bv);
+       LASSERT(bv, /**/);
 
        Buffer const & buffer = bv->buffer();
        graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
@@ -120,12 +118,14 @@ RenderPreview::getPreviewImage(Buffer const & buffer) const
 
 void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       BOOST_ASSERT(mi.base.bv);
+       LASSERT(mi.base.bv, /**/);
 
        graphics::PreviewImage const * const pimage =
                getPreviewImage(mi.base.bv->buffer());
 
        if (pimage) {
+               // If prepared, load the picture before dim calculation. See bug #5627.
+               pimage->image();
                dim = pimage->dim();
        } else {
                dim.asc = 50;
@@ -144,7 +144,7 @@ void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void RenderPreview::draw(PainterInfo & pi, int x, int y) const
 {
-       BOOST_ASSERT(pi.base.bv);
+       LASSERT(pi.base.bv, /**/);
 
        graphics::PreviewImage const * const pimage =
                getPreviewImage(pi.base.bv->buffer());