projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Use make_shared<>."
[dcpomatic.git]
/
test
/
image_test.cc
diff --git
a/test/image_test.cc
b/test/image_test.cc
index 59b35a96bb876c54331da85589b9f12fa3a3ac1b..d002630356d6b402fe2fe1707e88f9c507594219 100644
(file)
--- 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
*/
* @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 <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;
#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)
{
BOOST_AUTO_TEST_CASE (aligned_image_test)
{
@@
-140,7
+138,7
@@
BOOST_AUTO_TEST_CASE (alpha_blend_test)
{
int const stride = 48 * 4;
{
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];
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];
B->make_transparent ();
uint8_t* b = B->data()[0];
@@
-194,7
+192,7
@@
BOOST_AUTO_TEST_CASE (merge_test1)
{
int const stride = 48 * 4;
{
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];
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)
{
/** 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) {
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;
}
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) {
B->make_transparent ();
uint8_t* b = B->data()[0];
for (int x = 0; x < 16; ++x) {