From 87da92b45a9a0cf4ce809ea580a78c4dd5d96021 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 7 Nov 2014 22:33:37 +0000
Subject: Remove log from ImageProxy hierarchy.

---
 src/lib/image_proxy.cc | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'src/lib/image_proxy.cc')

diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index b6b387b76..7013a69c9 100644
--- a/src/lib/image_proxy.cc
+++ b/src/lib/image_proxy.cc
@@ -26,31 +26,22 @@
 #include "image.h"
 #include "exceptions.h"
 #include "cross.h"
-#include "log.h"
 
 #include "i18n.h"
 
-#define LOG_TIMING(...) _log->microsecond_log (String::compose (__VA_ARGS__), Log::TYPE_TIMING);
-
 using std::cout;
 using std::string;
 using boost::shared_ptr;
 
-ImageProxy::ImageProxy (shared_ptr<Log> log)
-	: _log (log)
-{
-
-}
-
 shared_ptr<ImageProxy>
-image_proxy_factory (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket, shared_ptr<Log> log)
+image_proxy_factory (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
 {
 	if (xml->string_child("Type") == N_("Raw")) {
-		return shared_ptr<ImageProxy> (new RawImageProxy (xml, socket, log));
+		return shared_ptr<ImageProxy> (new RawImageProxy (xml, socket));
 	} else if (xml->string_child("Type") == N_("Magick")) {
-		return shared_ptr<MagickImageProxy> (new MagickImageProxy (xml, socket, log));
+		return shared_ptr<MagickImageProxy> (new MagickImageProxy (xml, socket));
 	} else if (xml->string_child("Type") == N_("J2K")) {
-		return shared_ptr<J2KImageProxy> (new J2KImageProxy (xml, socket, log));
+		return shared_ptr<J2KImageProxy> (new J2KImageProxy (xml, socket));
 	}
 
 	throw NetworkError (_("Unexpected image type received by server"));
-- 
cgit v1.2.3