summaryrefslogtreecommitdiff
path: root/test/scaling_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-06-21 23:08:53 +0100
committerCarl Hetherington <cth@carlh.net>2016-06-21 23:08:53 +0100
commita8a0dfd1b21de6c0facf965ab119833ff6f790bf (patch)
tree88bd3a7dd6d4ae56a1efa9b7443c341550759869 /test/scaling_test.cc
parente669b562937786bf5b771c927cc03a4074b01be8 (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 'test/scaling_test.cc')
-rw-r--r--test/scaling_test.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index 4bb6551d3..5ac5c7525 100644
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -22,18 +22,16 @@
* @brief Test scaling and black-padding of images from a still-image source.
*/
+#include <boost/test/unit_test.hpp>
#include "lib/image_content.h"
#include "lib/ratio.h"
#include "lib/film.h"
#include "lib/dcp_content_type.h"
#include "lib/video_content.h"
#include "test.h"
-#include <boost/test/unit_test.hpp>
-#include <boost/make_shared.hpp>
using std::string;
using boost::shared_ptr;
-using boost::make_shared;
static void scaling_test_for (shared_ptr<Film> film, shared_ptr<Content> content, string image, string container)
{
@@ -62,7 +60,7 @@ BOOST_AUTO_TEST_CASE (scaling_test)
shared_ptr<Film> film = new_test_film ("scaling_test");
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
film->set_name ("scaling_test");
- shared_ptr<ImageContent> imc = make_shared<ImageContent> (film, "test/data/simple_testcard_640x480.png");
+ shared_ptr<ImageContent> imc (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
film->examine_and_add_content (imc);