C++11 tidying.
authorCarl Hetherington <cth@carlh.net>
Mon, 24 May 2021 22:56:44 +0000 (00:56 +0200)
committerCarl Hetherington <cth@carlh.net>
Tue, 25 May 2021 19:35:12 +0000 (21:35 +0200)
src/lib/image_proxy.cc

index f6f6350d8f53a258caa4814fb5aea2c4a77f6947..d81a3ffef0f824600c5b6eecb59710040e72d285 100644 (file)
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "image_proxy.h"
 #include "raw_image_proxy.h"
 #include "ffmpeg_image_proxy.h"
 
 #include "i18n.h"
 
+
 using std::cout;
-using std::string;
+using std::make_shared;
 using std::shared_ptr;
+using std::string;
+
 
 shared_ptr<ImageProxy>
 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));
+               return make_shared<RawImageProxy>(xml, socket);
        } else if (xml->string_child("Type") == N_("FFmpeg")) {
                return shared_ptr<FFmpegImageProxy> (new FFmpegImageProxy(xml, socket));
        } else if (xml->string_child("Type") == N_("J2K")) {
-               return shared_ptr<J2KImageProxy> (new J2KImageProxy (xml, socket));
+               return make_shared<J2KImageProxy>(xml, socket);
        }
 
        throw NetworkError (_("Unexpected image type received by server"));