X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsLoader.cpp;h=36a6c06d2c12748f2f834612d756c313e984b55d;hb=a700d657b3b06541b10ddae8cc5847bd46d06aae;hp=498394e421f09a9a7bb9aec16f45945d4270d8e9;hpb=c053a9394d1075ecad02ccce2f34c95f08c1f00f;p=lyx.git

diff --git a/src/graphics/GraphicsLoader.cpp b/src/graphics/GraphicsLoader.cpp
index 498394e421..36a6c06d2c 100644
--- a/src/graphics/GraphicsLoader.cpp
+++ b/src/graphics/GraphicsLoader.cpp
@@ -22,8 +22,9 @@
 
 #include "support/bind.h"
 
-#include <set>
 #include <queue>
+#include <memory>
+#include <set>
 
 using namespace std;
 using namespace lyx::support;
@@ -77,7 +78,6 @@ static int const s_numimages_ = 10;
 static int const s_millisecs_ = 500;
 
 
-// FIXME THREAD
 LoaderQueue & LoaderQueue::get()
 {
 	static LoaderQueue singleton;
@@ -159,9 +159,9 @@ void LoaderQueue::touch(Cache::ItemPtr const & item)
 //
 /////////////////////////////////////////////////////////////////////
 
-typedef shared_ptr<Image> ImagePtr;
+typedef std::shared_ptr<Image> ImagePtr;
 
-class Loader::Impl : public boost::signals::trackable {
+class Loader::Impl : public boost::signals2::trackable {
 public:
 	///
 	Impl();
@@ -187,9 +187,9 @@ public:
 	/// We modify a local copy of the image once it is loaded.
 	ImagePtr image_;
 	/// This signal is emitted when the image loading status changes.
-	boost::signal<void()> signal_;
+	boost::signals2::signal<void()> signal_;
 	/// The connection of the signal StatusChanged 	
-	boost::signals::connection sc_;
+	boost::signals2::connection sc_;
 
 	double displayPixelRatio() const
 	{
@@ -347,7 +347,7 @@ void Loader::setDisplayPixelRatio(double scale)
 }
 
 
-boost::signals::connection Loader::connect(slot_type const & slot) const
+boost::signals2::connection Loader::connect(slot_type const & slot) const
 {
 	return pimpl_->signal_.connect(slot);
 }
@@ -460,10 +460,6 @@ void Loader::Impl::createPixmap()
 		if (idx != string::npos && idx > 3) {
 			if (filename.substr(idx - 3, 3) == "@2x") {
 				params_.pixel_ratio = 2.0;
-			} else if (cached_item_->filename().extension() == "svgz") {
-				params_.pixel_ratio = 4.0;
-			} else if (cached_item_->filename().extension() == "svg") {
-				params_.pixel_ratio = 4.0;
 			}
 		}
 	}