From 689fa55d1529ad88449ca464e9107c4dcc54d1cb Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 3 May 2021 11:17:34 +0200
Subject: C++11 tidying.

---
 src/lib/raw_image_proxy.cc | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

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

diff --git a/src/lib/raw_image_proxy.cc b/src/lib/raw_image_proxy.cc
index 667f25b06..fed40c45e 100644
--- a/src/lib/raw_image_proxy.cc
+++ b/src/lib/raw_image_proxy.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "raw_image_proxy.h"
 #include "image.h"
 #include "warnings.h"
@@ -33,55 +34,63 @@ DCPOMATIC_ENABLE_WARNINGS
 
 #include "i18n.h"
 
-using std::string;
-using std::pair;
+
+using std::dynamic_pointer_cast;
 using std::make_pair;
+using std::make_shared;
+using std::pair;
 using std::shared_ptr;
-using std::dynamic_pointer_cast;
+using std::string;
 using boost::optional;
 using dcp::raw_convert;
 
+
 RawImageProxy::RawImageProxy (shared_ptr<Image> image)
 	: _image (image)
 {
 
 }
 
+
 RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
 {
 	dcp::Size size (
-		xml->number_child<int> ("Width"), xml->number_child<int> ("Height")
+		xml->number_child<int>("Width"), xml->number_child<int>("Height")
 		);
 
-	_image.reset (new Image (static_cast<AVPixelFormat> (xml->number_child<int> ("PixelFormat")), size, true));
+	_image = make_shared<Image>(static_cast<AVPixelFormat>(xml->number_child<int>("PixelFormat")), size, true);
 	_image->read_from_socket (socket);
 }
 
+
 ImageProxy::Result
 RawImageProxy::image (optional<dcp::Size>) const
 {
 	return Result (_image, 0);
 }
 
+
 void
 RawImageProxy::add_metadata (xmlpp::Node* node) const
 {
-	node->add_child("Type")->add_child_text (N_("Raw"));
-	node->add_child("Width")->add_child_text (raw_convert<string> (_image->size().width));
-	node->add_child("Height")->add_child_text (raw_convert<string> (_image->size().height));
-	node->add_child("PixelFormat")->add_child_text (raw_convert<string> (static_cast<int> (_image->pixel_format ())));
+	node->add_child("Type")->add_child_text(N_("Raw"));
+	node->add_child("Width")->add_child_text(raw_convert<string>(_image->size().width));
+	node->add_child("Height")->add_child_text(raw_convert<string>(_image->size().height));
+	node->add_child("PixelFormat")->add_child_text(raw_convert<string>(static_cast<int>(_image->pixel_format())));
 }
 
+
 void
 RawImageProxy::write_to_socket (shared_ptr<Socket> socket) const
 {
 	_image->write_to_socket (socket);
 }
 
+
 bool
 RawImageProxy::same (shared_ptr<const ImageProxy> other) const
 {
-	shared_ptr<const RawImageProxy> rp = dynamic_pointer_cast<const RawImageProxy> (other);
+	auto rp = dynamic_pointer_cast<const RawImageProxy> (other);
 	if (!rp) {
 		return false;
 	}
@@ -89,6 +98,7 @@ RawImageProxy::same (shared_ptr<const ImageProxy> other) const
 	return (*_image.get()) == (*rp->image().image.get());
 }
 
+
 size_t
 RawImageProxy::memory_used () const
 {
-- 
cgit v1.2.3