X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage.cc;h=71a3a5bccd9b174b5ffea94f7eecbac250265952;hp=1107f0a4077964ef07b67e221ade50d98f9b0fcb;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hpb=e669b562937786bf5b771c927cc03a4074b01be8 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());