Add Data class and change API to a raw pointer.

5 files changed, 10 insertions, 10 deletions

diff --git a/test/dcp_font_test.cc b/test/dcp_font_test.cc
index ab7a707d..6a3941f9 100644
--- a/test/dcp_font_test.cc
+++ b/test/dcp_font_test.cc
@@ -83,7 +83,7 @@ BOOST_AUTO_TEST_CASE (interop_dcp_font_test)
 	fread (ref.get(), 1, size, f);
 	fclose (f);
 
-	BOOST_CHECK_EQUAL (memcmp (subs2->_fonts.front().data.data().get(), ref.get(), size), 0);
+	BOOST_CHECK_EQUAL (memcmp (subs2->_fonts.front().data.data(), ref.get(), size), 0);
 }
 
 /** Create a DCP with SMPTE subtitles and check that the font is written and read back correctly */
@@ -121,5 +121,5 @@ BOOST_AUTO_TEST_CASE (smpte_dcp_font_test)
 	fclose (f);
 
 	BOOST_REQUIRE (subs2->_fonts.front().data.data());
-	BOOST_CHECK_EQUAL (memcmp (subs2->_fonts.front().data.data().get(), ref.get(), size), 0);
+	BOOST_CHECK_EQUAL (memcmp (subs2->_fonts.front().data.data(), ref.get(), size), 0);
 }
diff --git a/test/frame_info_hash_test.cc b/test/frame_info_hash_test.cc
index 3070ecd6..2d08669e 100644
--- a/test/frame_info_hash_test.cc
+++ b/test/frame_info_hash_test.cc
@@ -52,7 +52,7 @@ check (unsigned int* seed, shared_ptr<dcp::PictureAssetWriter> writer, string ha
 
 	dcp::ArrayData data = dcp::compress_j2k (xyz, 100000000, 24, false, false);
 
-	dcp::FrameInfo info = writer->write (data.data().get(), data.size());
+	dcp::FrameInfo info = writer->write (data.data(), data.size());
 	BOOST_CHECK_EQUAL (info.hash, hash);
 }
 
diff --git a/test/make_digest_test.cc b/test/make_digest_test.cc
index 11c410d0..7fefd809 100644
--- a/test/make_digest_test.cc
+++ b/test/make_digest_test.cc
@@ -50,7 +50,7 @@ BOOST_AUTO_TEST_CASE (make_digest_test)
 	srand (1);
 	int const N = 256 * 1024 * 1024;
 	dcp::ArrayData data (N);
-	uint8_t* p = data.data().get();
+	uint8_t* p = data.data();
 	for (int i = 0; i < N; ++i) {
 		*p++ = rand() & 0xff;
 	}
diff --git a/test/test.cc b/test/test.cc
index 245dd91c..bace2326 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -429,7 +429,7 @@ black_picture_asset (boost::filesystem::path dir, int frames)
 	boost::filesystem::create_directories (dir);
 	shared_ptr<dcp::PictureAssetWriter> writer = asset->start_write (dir / "pic.mxf", true);
 	for (int i = 0; i < frames; ++i) {
-		writer->write (frame.data().get(), frame.size());
+		writer->write (frame.data(), frame.size());
 	}
 	writer->finalize ();
 
diff --git a/test/verify_test.cc b/test/verify_test.cc
index 3e2a665f..9b9111d2 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -515,7 +515,7 @@ dcp_from_frame (dcp::ArrayData const& frame, boost::filesystem::path dir)
 	boost::filesystem::create_directories (dir);
 	shared_ptr<dcp::PictureAssetWriter> writer = asset->start_write (dir / "pic.mxf", true);
 	for (int i = 0; i < 24; ++i) {
-		writer->write (frame.data().get(), frame.size());
+		writer->write (frame.data(), frame.size());
 	}
 	writer->finalize ();
 
@@ -542,8 +542,8 @@ BOOST_AUTO_TEST_CASE (verify_test15)
 
 	/* Place it in a bigger block with some zero padding at the end */
 	dcp::ArrayData oversized_frame(too_big);
-	memcpy (oversized_frame.data().get(), frame.data().get(), frame.size());
-	memset (oversized_frame.data().get() + frame.size(), 0, too_big - frame.size());
+	memcpy (oversized_frame.data(), frame.data(), frame.size());
+	memset (oversized_frame.data() + frame.size(), 0, too_big - frame.size());
 
 	boost::filesystem::path const dir("build/test/verify_test15");
 	boost::filesystem::remove_all (dir);
@@ -569,8 +569,8 @@ BOOST_AUTO_TEST_CASE (verify_test16)
 
 	/* Place it in a bigger block with some zero padding at the end */
 	dcp::ArrayData oversized_frame(nearly_too_big);
-	memcpy (oversized_frame.data().get(), frame.data().get(), frame.size());
-	memset (oversized_frame.data().get() + frame.size(), 0, nearly_too_big - frame.size());
+	memcpy (oversized_frame.data(), frame.data(), frame.size());
+	memset (oversized_frame.data() + frame.size(), 0, nearly_too_big - frame.size());
 
 	boost::filesystem::path const dir("build/test/verify_test16");
 	boost::filesystem::remove_all (dir);