diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-12 17:12:49 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-12 17:12:49 +0100 |
| commit | ad6c0bbec4f354f29fb968099ff1a0ce2e57c43a (patch) | |
| tree | e5928a8f22bf9a3c2a18927b88dc8c3d382f64be /test/image_test.cc | |
| parent | 0eee0c3adda726542a5f2b8fad68f54ebf701392 (diff) | |
Remove unused RGBPlusAlphaImage; merge Image/SimpleImage.
Diffstat (limited to 'test/image_test.cc')
| -rw-r--r-- | test/image_test.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/image_test.cc b/test/image_test.cc index b74531c46..8dc289602 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -1,7 +1,7 @@ BOOST_AUTO_TEST_CASE (aligned_image_test) { - SimpleImage* s = new SimpleImage (PIX_FMT_RGB24, libdcp::Size (50, 50), true); + Image* s = new Image (PIX_FMT_RGB24, libdcp::Size (50, 50), true); BOOST_CHECK_EQUAL (s->components(), 1); /* 160 is 150 aligned to the nearest 32 bytes */ BOOST_CHECK_EQUAL (s->stride()[0], 160); @@ -12,7 +12,7 @@ BOOST_AUTO_TEST_CASE (aligned_image_test) BOOST_CHECK (!s->data()[3]); /* copy constructor */ - SimpleImage* t = new SimpleImage (*s); + Image* t = new Image (*s); BOOST_CHECK_EQUAL (t->components(), 1); BOOST_CHECK_EQUAL (t->stride()[0], 160); BOOST_CHECK_EQUAL (t->line_size()[0], 150); @@ -28,7 +28,7 @@ BOOST_AUTO_TEST_CASE (aligned_image_test) BOOST_CHECK (t->stride()[0] == s->stride()[0]); /* assignment operator */ - SimpleImage* u = new SimpleImage (PIX_FMT_YUV422P, libdcp::Size (150, 150), false); + Image* u = new Image (PIX_FMT_YUV422P, libdcp::Size (150, 150), false); *u = *s; BOOST_CHECK_EQUAL (u->components(), 1); BOOST_CHECK_EQUAL (u->stride()[0], 160); @@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE (aligned_image_test) BOOST_AUTO_TEST_CASE (compact_image_test) { - SimpleImage* s = new SimpleImage (PIX_FMT_RGB24, libdcp::Size (50, 50), false); + Image* s = new Image (PIX_FMT_RGB24, libdcp::Size (50, 50), false); BOOST_CHECK_EQUAL (s->components(), 1); BOOST_CHECK_EQUAL (s->stride()[0], 50 * 3); BOOST_CHECK_EQUAL (s->line_size()[0], 50 * 3); @@ -61,7 +61,7 @@ BOOST_AUTO_TEST_CASE (compact_image_test) BOOST_CHECK (!s->data()[3]); /* copy constructor */ - SimpleImage* t = new SimpleImage (*s); + Image* t = new Image (*s); BOOST_CHECK_EQUAL (t->components(), 1); BOOST_CHECK_EQUAL (t->stride()[0], 50 * 3); BOOST_CHECK_EQUAL (t->line_size()[0], 50 * 3); @@ -77,7 +77,7 @@ BOOST_AUTO_TEST_CASE (compact_image_test) BOOST_CHECK (t->stride()[0] == s->stride()[0]); /* assignment operator */ - SimpleImage* u = new SimpleImage (PIX_FMT_YUV422P, libdcp::Size (150, 150), true); + Image* u = new Image (PIX_FMT_YUV422P, libdcp::Size (150, 150), true); *u = *s; BOOST_CHECK_EQUAL (u->components(), 1); BOOST_CHECK_EQUAL (u->stride()[0], 50 * 3); @@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE (compact_image_test) BOOST_AUTO_TEST_CASE (crop_image_test) { /* This was to check out a bug with valgrind, and is probably not very useful */ - shared_ptr<SimpleImage> image (new SimpleImage (PIX_FMT_YUV420P, libdcp::Size (16, 16), true)); + shared_ptr<Image> image (new Image (PIX_FMT_YUV420P, libdcp::Size (16, 16), true)); image->make_black (); Crop crop; crop.top = 3; @@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE (crop_image_test) BOOST_AUTO_TEST_CASE (crop_image_test2) { /* Here's a 1998 x 1080 image which is black */ - shared_ptr<Image> image (new SimpleImage (PIX_FMT_YUV420P, libdcp::Size (1998, 1080), true)); + shared_ptr<Image> image (new Image (PIX_FMT_YUV420P, libdcp::Size (1998, 1080), true)); image->make_black (); /* Crop it by 1 pixel */ |