diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-21 23:08:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-21 23:08:53 +0100 |
| commit | a8a0dfd1b21de6c0facf965ab119833ff6f790bf (patch) | |
| tree | 88bd3a7dd6d4ae56a1efa9b7443c341550759869 /src/lib/j2k_image_proxy.cc | |
| parent | e669b562937786bf5b771c927cc03a4074b01be8 (diff) | |
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.
Diffstat (limited to 'src/lib/j2k_image_proxy.cc')
| -rw-r--r-- | src/lib/j2k_image_proxy.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index 35d70162c..44b5ebea7 100644 --- a/src/lib/j2k_image_proxy.cc +++ b/src/lib/j2k_image_proxy.cc @@ -30,7 +30,6 @@ #include <dcp/j2k.h> #include <libcxml/cxml.h> #include <libxml++/libxml++.h> -#include <boost/make_shared.hpp> #include <iostream> #include "i18n.h" @@ -40,7 +39,6 @@ using std::cout; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; -using boost::make_shared; using dcp::Data; /** Construct a J2KImageProxy from a JPEG2000 file */ @@ -109,7 +107,7 @@ J2KImageProxy::image (optional<dcp::NoteHandler>) const } } - shared_ptr<Image> image = make_shared<Image> (pixel_format(), _size, true); + shared_ptr<Image> image (new Image (pixel_format(), _size, true)); /* Copy data in whatever format (sRGB or XYZ) into our Image; I'm assuming the data is 12-bit either way. |