From a8a0dfd1b21de6c0facf965ab119833ff6f790bf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 21 Jun 2016 23:08:53 +0100 Subject: Revert "Use make_shared<>." Support for this seems to vary wildly across DoM's build targets. Stuff that builds on 16.04 won't build on 14.04, for example. Seems to not be worth the hassle now. This reverts commit 5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f. --- src/lib/image.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/lib/image.cc') diff --git a/src/lib/image.cc b/src/lib/image.cc index 1107f0a40..71a3a5bcc 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -34,7 +34,6 @@ extern "C" { #include #include } -#include #include #include "i18n.h" @@ -46,7 +45,6 @@ using std::cerr; using std::list; using std::runtime_error; using boost::shared_ptr; -using boost::make_shared; using dcp::Size; int @@ -151,7 +149,7 @@ Image::crop_scale_window ( To get around this, we ask Image to overallocate its buffers by the overrun. */ - shared_ptr out = make_shared (out_format, out_size, out_aligned, (out_size.width - inter_size.width) / 2); + shared_ptr out (new Image (out_format, out_size, out_aligned, (out_size.width - inter_size.width) / 2)); out->make_black (); /* Size of the image after any crop */ @@ -229,7 +227,7 @@ Image::scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_fo */ DCPOMATIC_ASSERT (aligned ()); - shared_ptr scaled = make_shared (out_format, out_size, out_aligned); + shared_ptr scaled (new Image (out_format, out_size, out_aligned)); struct SwsContext* scale_context = sws_getContext ( size().width, size().height, pixel_format(), @@ -821,7 +819,7 @@ merge (list images) all.extend (dcpomatic::Rect (i->position, i->image->size().width, i->image->size().height)); } - shared_ptr merged = make_shared (images.front().image->pixel_format (), dcp::Size (all.width, all.height), true); + shared_ptr merged (new Image (images.front().image->pixel_format (), dcp::Size (all.width, all.height), true)); merged->make_transparent (); for (list::const_iterator i = images.begin(); i != images.end(); ++i) { merged->alpha_blend (i->image, i->position - all.position()); -- cgit v1.2.3