summaryrefslogtreecommitdiff
path: root/test/round_trip_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-08-02 18:23:36 +0200
committerCarl Hetherington <cth@carlh.net>2024-08-02 18:23:36 +0200
commit7d9e108ba3629b2e9120bc1da3354935c41aca37 (patch)
treec8ffdb2bca75d62bfe9fa2262e9fc4cd19c45027 /test/round_trip_test.cc
parent6f98afd8021f9475bbd342bdcb39162b3167fa9e (diff)
WIP: more hacks.shared-ptr
Diffstat (limited to 'test/round_trip_test.cc')
-rw-r--r--test/round_trip_test.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index ffba5cbd..151bc1bc 100644
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -128,16 +128,16 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
BOOST_CHECK (!kdm_B.keys().empty ());
asset_B->set_key (kdm_B.keys().front().key());
- auto xyz_A = asset_A->start_read()->get_frame(0)->xyz_image ();
- auto xyz_B = asset_B->start_read()->get_frame(0)->xyz_image ();
+ auto xyz_A = asset_A->start_read()->get_frame(0).xyz_image();
+ auto 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(), xyz_A->size().width * 4);
+ vector<uint8_t> frame_A(xyz_A->size().width * xyz_A->size().height * 4);
+ dcp::xyz_to_rgba(xyz_A, dcp::ColourConversion::srgb_to_xyz(), frame_A.data(), 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(), xyz_B->size().width * 4);
+ vector<uint8_t> frame_B(xyz_B->size().width * xyz_B->size().height * 4);
+ dcp::xyz_to_rgba(xyz_B, dcp::ColourConversion::srgb_to_xyz(), frame_B.data(), 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);
- BOOST_CHECK_EQUAL (memcmp (frame_A.get(), frame_B.get(), xyz_A->size().width * xyz_A->size().height * 4), 0);
+ BOOST_CHECK_EQUAL (memcmp (frame_A.data(), frame_B.data(), xyz_A->size().width * xyz_A->size().height * 4), 0);
}