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 /test/image_test.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 'test/image_test.cc')
| -rw-r--r-- | test/image_test.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/test/image_test.cc b/test/image_test.cc index 59b35a96b..d00263035 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -24,17 +24,15 @@ * @see test/make_black_test.cc, test/pixel_formats_test.cc */ +#include <boost/test/unit_test.hpp> #include <Magick++.h> #include "lib/image.h" -#include <boost/test/unit_test.hpp> -#include <boost/make_shared.hpp> #include <iostream> using std::string; using std::list; using std::cout; using boost::shared_ptr; -using boost::make_shared; BOOST_AUTO_TEST_CASE (aligned_image_test) { @@ -140,7 +138,7 @@ BOOST_AUTO_TEST_CASE (alpha_blend_test) { int const stride = 48 * 4; - shared_ptr<Image> A = make_shared<Image> (AV_PIX_FMT_RGBA, dcp::Size (48, 48), false); + shared_ptr<Image> A (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 48), false)); A->make_black (); uint8_t* a = A->data()[0]; @@ -153,7 +151,7 @@ BOOST_AUTO_TEST_CASE (alpha_blend_test) } } - shared_ptr<Image> B = make_shared<Image> (AV_PIX_FMT_RGBA, dcp::Size (48, 48), true); + shared_ptr<Image> B (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 48), true)); B->make_transparent (); uint8_t* b = B->data()[0]; @@ -194,7 +192,7 @@ BOOST_AUTO_TEST_CASE (merge_test1) { int const stride = 48 * 4; - shared_ptr<Image> A = make_shared<Image> (AV_PIX_FMT_RGBA, dcp::Size (48, 48), false); + shared_ptr<Image> A (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 48), false)); A->make_transparent (); uint8_t* a = A->data()[0]; @@ -219,7 +217,7 @@ BOOST_AUTO_TEST_CASE (merge_test1) /** Test merge (list<PositionImage>) with two images */ BOOST_AUTO_TEST_CASE (merge_test2) { - shared_ptr<Image> A = make_shared<Image> (AV_PIX_FMT_RGBA, dcp::Size (48, 1), false); + shared_ptr<Image> A (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 1), false)); A->make_transparent (); uint8_t* a = A->data()[0]; for (int x = 0; x < 16; ++x) { @@ -229,7 +227,7 @@ BOOST_AUTO_TEST_CASE (merge_test2) a[x * 4 + 3] = 255; } - shared_ptr<Image> B = make_shared<Image> (AV_PIX_FMT_RGBA, dcp::Size (48, 1), false); + shared_ptr<Image> B (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 1), false)); B->make_transparent (); uint8_t* b = B->data()[0]; for (int x = 0; x < 16; ++x) { |