X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fround_trip_test.cc;h=f730485bc65adb72783ebd4d572282b7d3578753;hb=d95eacd3851a20e52202465ec22b4f72a4983dc8;hp=10b7b6fe04a219859374c823fb514c54c910bd00;hpb=9a5809be580c1a12864d751a710f6783363d3de7;p=libdcp.git

diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index 10b7b6fe..f730485b 100644
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -46,7 +46,6 @@
 #include "mono_picture_asset_reader.h"
 #include "reel_picture_asset.h"
 #include "reel_mono_picture_asset.h"
-#include "file.h"
 #include "openjpeg_image.h"
 #include "rgb_xyz.h"
 #include "colour_conversion.h"
@@ -57,7 +56,7 @@
 using std::list;
 using std::vector;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::scoped_array;
 
 /** Build an encrypted picture asset and a KDM for it and check that the KDM can be decrypted */
@@ -70,7 +69,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 
 	shared_ptr<dcp::MonoPictureAsset> asset_A (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
 	shared_ptr<dcp::PictureAssetWriter> writer = asset_A->start_write (work_dir / "video.mxf", false);
-	dcp::File j2c ("test/data/32x32_red_square.j2c");
+	dcp::ArrayData j2c ("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		writer->write (j2c.data (), j2c.size ());
 	}
@@ -110,10 +109,10 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 
 	/* Check that the decrypted KDMKeys are the same as the ones we started with */
 	BOOST_CHECK_EQUAL (kdm_A.keys().size(), kdm_B.keys().size());
-	list<dcp::DecryptedKDMKey> keys_A = kdm_A.keys ();
-	list<dcp::DecryptedKDMKey> keys_B = kdm_B.keys ();
-	list<dcp::DecryptedKDMKey>::const_iterator i = keys_A.begin();
-	list<dcp::DecryptedKDMKey>::const_iterator j = keys_B.begin();
+	auto keys_A = kdm_A.keys ();
+	auto keys_B = kdm_B.keys ();
+	auto i = keys_A.begin();
+	auto j = keys_B.begin();
 	while (i != keys_A.end ()) {
 		BOOST_CHECK (*i == *j);
 		++i;