diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-05-25 00:03:51 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-05-25 00:03:51 +0100 |
| commit | 0f664dab81a835feebd5db92942413f91747481f (patch) | |
| tree | b0761612b7ca45c3ac4d7856dfc8e26e4f599295 /test | |
| parent | f1d209319f90adc50e0f3d2a853216052f290bd5 (diff) | |
More tests; fix blend for YUV420P10LE.
Diffstat (limited to 'test')
| -rw-r--r-- | test/image_test.cc | 4 | ||||
| -rw-r--r-- | test/test.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/test/image_test.cc b/test/image_test.cc index 6a35be07f..59000918a 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -180,8 +180,12 @@ alpha_blend_test_one (AVPixelFormat format, string suffix) /** Test Image::alpha_blend */ BOOST_AUTO_TEST_CASE (alpha_blend_test) { + alpha_blend_test_one (AV_PIX_FMT_RGB24, "rgb24"); + alpha_blend_test_one (AV_PIX_FMT_BGRA, "bgra"); alpha_blend_test_one (AV_PIX_FMT_RGBA, "rgba"); + alpha_blend_test_one (AV_PIX_FMT_RGB48LE, "rgb48le"); alpha_blend_test_one (AV_PIX_FMT_YUV420P, "yuv420p"); + alpha_blend_test_one (AV_PIX_FMT_YUV420P10LE, "yuv420p10le"); } /** Test merge (list<PositionImage>) with a single image */ diff --git a/test/test.cc b/test/test.cc index 85c36c16c..b81d20134 100644 --- a/test/test.cc +++ b/test/test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -175,7 +175,7 @@ check_image (boost::filesystem::path ref, boost::filesystem::path check) ref_image.read (ref.string ()); Magick::Image check_image; check_image.read (check.string ()); - DCPOMATIC_ASSERT (ref_image.compare (check_image)); + BOOST_CHECK_MESSAGE (ref_image.compare (check_image), ref << " differs from " << check); } void |