summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-03-30 23:08:54 +0100
committerCarl Hetherington <cth@carlh.net>2017-03-30 23:08:54 +0100
commitb0b10b50e5a9a21e54459369b9e6eba2b7dd44a3 (patch)
tree202ecf605396db022c8f608ed87cf8e0c7be59c3 /test
parent47c65b4db31a821c4c0934d0dcc88970423980c3 (diff)
Add stride parameter to dcp::xyz_to_rgba.
Diffstat (limited to 'test')
-rw-r--r--test/decryption_test.cc2
-rw-r--r--test/round_trip_test.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index 32ea7cda..49fb3a92 100644
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -52,7 +52,7 @@ get_frame (dcp::DCP const & dcp)
shared_ptr<dcp::OpenJPEGImage> xyz = j2k_frame->xyz_image();
uint8_t* argb = new uint8_t[xyz->size().width * xyz->size().height * 4];
- dcp::xyz_to_rgba (j2k_frame->xyz_image(), dcp::ColourConversion::srgb_to_xyz(), argb);
+ dcp::xyz_to_rgba (j2k_frame->xyz_image(), dcp::ColourConversion::srgb_to_xyz(), argb, xyz->size().width * 4);
return make_pair (argb, xyz->size ());
}
diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index e2b90244..396dba67 100644
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -112,10 +112,10 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
shared_ptr<dcp::OpenJPEGImage> xyz_B = asset_B->start_read()->get_frame(0)->xyz_image ();
scoped_array<uint8_t> frame_A (new uint8_t[xyz_A->size().width * xyz_A->size().height * 4]);
- dcp::xyz_to_rgba (xyz_A, dcp::ColourConversion::srgb_to_xyz(), frame_A.get());
+ dcp::xyz_to_rgba (xyz_A, dcp::ColourConversion::srgb_to_xyz(), frame_A.get(), xyz_A->size().width * 4);
scoped_array<uint8_t> frame_B (new uint8_t[xyz_B->size().width * xyz_B->size().height * 4]);
- dcp::xyz_to_rgba (xyz_B, dcp::ColourConversion::srgb_to_xyz(), frame_B.get());
+ dcp::xyz_to_rgba (xyz_B, dcp::ColourConversion::srgb_to_xyz(), frame_B.get(), xyz_B->size().width * 4);
BOOST_CHECK_EQUAL (xyz_A->size().width, xyz_B->size().width);
BOOST_CHECK_EQUAL (xyz_A->size().height, xyz_B->size().height);