diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-11-07 22:33:37 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-11-07 22:33:37 +0000 |
| commit | 87da92b45a9a0cf4ce809ea580a78c4dd5d96021 (patch) | |
| tree | 4aeb53945102dbbd373b522917b6878478f5d206 /src/lib/image_proxy.cc | |
| parent | 9980c40a47abe24f8dd3cb16e14ad4a3254a8465 (diff) | |
Remove log from ImageProxy hierarchy.
Diffstat (limited to 'src/lib/image_proxy.cc')
| -rw-r--r-- | src/lib/image_proxy.cc | 17 |
1 files changed, 4 insertions, 13 deletions
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")); |
