diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-21 01:14:06 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-21 01:14:06 +0100 |
| commit | 5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f (patch) | |
| tree | 769dca1358e35017ce5a5b3ab2dfafe2b24d61ed /src/lib/image.cc | |
| parent | 4e83acad0c2a5c528709a175a80261b8147d3b49 (diff) | |
Use make_shared<>.
Diffstat (limited to 'src/lib/image.cc')
| -rw-r--r-- | src/lib/image.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/image.cc b/src/lib/image.cc index 71a3a5bcc..1107f0a40 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -34,6 +34,7 @@ extern "C" { #include <libavutil/pixdesc.h> #include <libavutil/frame.h> } +#include <boost/make_shared.hpp> #include <iostream> #include "i18n.h" @@ -45,6 +46,7 @@ using std::cerr; using std::list; using std::runtime_error; using boost::shared_ptr; +using boost::make_shared; using dcp::Size; int @@ -149,7 +151,7 @@ Image::crop_scale_window ( To get around this, we ask Image to overallocate its buffers by the overrun. */ - shared_ptr<Image> out (new Image (out_format, out_size, out_aligned, (out_size.width - inter_size.width) / 2)); + shared_ptr<Image> out = make_shared<Image> (out_format, out_size, out_aligned, (out_size.width - inter_size.width) / 2); out->make_black (); /* Size of the image after any crop */ @@ -227,7 +229,7 @@ Image::scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_fo */ DCPOMATIC_ASSERT (aligned ()); - shared_ptr<Image> scaled (new Image (out_format, out_size, out_aligned)); + shared_ptr<Image> scaled = make_shared<Image> (out_format, out_size, out_aligned); struct SwsContext* scale_context = sws_getContext ( size().width, size().height, pixel_format(), @@ -819,7 +821,7 @@ merge (list<PositionImage> images) all.extend (dcpomatic::Rect<int> (i->position, i->image->size().width, i->image->size().height)); } - shared_ptr<Image> merged (new Image (images.front().image->pixel_format (), dcp::Size (all.width, all.height), true)); + shared_ptr<Image> merged = make_shared<Image> (images.front().image->pixel_format (), dcp::Size (all.width, all.height), true); merged->make_transparent (); for (list<PositionImage>::const_iterator i = images.begin(); i != images.end(); ++i) { merged->alpha_blend (i->image, i->position - all.position()); |