From 0ff4fa6058b305476e7bc60c590acb6135c49b1c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 13 Apr 2018 23:23:00 +0100 Subject: Account for J2K decoding at lower-than-maximum resolution when cropping the resulting images; fixes #1274. --- test/image_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/image_test.cc') diff --git a/test/image_test.cc b/test/image_test.cc index 7780c94cc..5adc35603 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -139,7 +139,7 @@ void alpha_blend_test_one (AVPixelFormat format, string suffix) { shared_ptr proxy (new MagickImageProxy (private_data / "prophet_frame.tiff")); - shared_ptr raw = proxy->image(); + shared_ptr raw = proxy->image().first; shared_ptr background = raw->convert_pixel_format (dcp::YUV_TO_RGB_REC709, format, true, false); shared_ptr overlay (new Image (AV_PIX_FMT_BGRA, dcp::Size(431, 891), true)); @@ -261,7 +261,7 @@ BOOST_AUTO_TEST_CASE (merge_test2) BOOST_AUTO_TEST_CASE (crop_scale_window_test) { shared_ptr proxy(new MagickImageProxy("test/data/flat_red.png")); - shared_ptr raw = proxy->image(); + shared_ptr raw = proxy->image().first; shared_ptr out = raw->crop_scale_window(Crop(), dcp::Size(1998, 836), dcp::Size(1998, 1080), dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_YUV420P, true, false); shared_ptr save = out->scale(dcp::Size(1998, 1080), dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_RGB24, false, false); write_image(save, "build/test/crop_scale_window_test.png", "RGB"); -- cgit v1.2.3