From 5d9ff746138a30c1469b788afe5a4eee25fed368 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 25 May 2021 00:56:44 +0200 Subject: C++11 tidying. --- src/lib/image_proxy.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/lib') diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc index f6f6350d8..d81a3ffef 100644 --- a/src/lib/image_proxy.cc +++ b/src/lib/image_proxy.cc @@ -18,6 +18,7 @@ */ + #include "image_proxy.h" #include "raw_image_proxy.h" #include "ffmpeg_image_proxy.h" @@ -31,19 +32,22 @@ #include "i18n.h" + using std::cout; -using std::string; +using std::make_shared; using std::shared_ptr; +using std::string; + shared_ptr image_proxy_factory (shared_ptr xml, shared_ptr socket) { if (xml->string_child("Type") == N_("Raw")) { - return shared_ptr (new RawImageProxy (xml, socket)); + return make_shared(xml, socket); } else if (xml->string_child("Type") == N_("FFmpeg")) { return shared_ptr (new FFmpegImageProxy(xml, socket)); } else if (xml->string_child("Type") == N_("J2K")) { - return shared_ptr (new J2KImageProxy (xml, socket)); + return make_shared(xml, socket); } throw NetworkError (_("Unexpected image type received by server")); -- cgit v1.2.3