Rename Data -> ArrayData.

8 files changed, 18 insertions, 18 deletions

diff --git a/test/frame_info_hash_test.cc b/test/frame_info_hash_test.cc
index ed440af5..3070ecd6 100644
--- a/test/frame_info_hash_test.cc
+++ b/test/frame_info_hash_test.cc
@@ -50,7 +50,7 @@ check (unsigned int* seed, shared_ptr<dcp::PictureAssetWriter> writer, string ha
 		}
 	}
 
-	dcp::Data data = dcp::compress_j2k (xyz, 100000000, 24, false, false);
+	dcp::ArrayData data = dcp::compress_j2k (xyz, 100000000, 24, false, false);
 
 	dcp::FrameInfo info = writer->write (data.data().get(), data.size());
 	BOOST_CHECK_EQUAL (info.hash, hash);
diff --git a/test/make_digest_test.cc b/test/make_digest_test.cc
index ec54c93c..11c410d0 100644
--- a/test/make_digest_test.cc
+++ b/test/make_digest_test.cc
@@ -31,7 +31,8 @@
     files in the program, then also delete it here.
 */
 
-#include "data.h"
+
+#include "array_data.h"
 #include "util.h"
 #include <boost/bind.hpp>
 #include <boost/test/unit_test.hpp>
@@ -48,7 +49,7 @@ BOOST_AUTO_TEST_CASE (make_digest_test)
 	/* Make a big file with some random data */
 	srand (1);
 	int const N = 256 * 1024 * 1024;
-	dcp::Data data (N);
+	dcp::ArrayData data (N);
 	uint8_t* p = data.data().get();
 	for (int i = 0; i < N; ++i) {
 		*p++ = rand() & 0xff;
diff --git a/test/read_interop_subtitle_test.cc b/test/read_interop_subtitle_test.cc
index 19d1cad8..2860a725 100644
--- a/test/read_interop_subtitle_test.cc
+++ b/test/read_interop_subtitle_test.cc
@@ -620,5 +620,5 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test3)
 	BOOST_REQUIRE_EQUAL (subs.subtitles().size(), 1);
 	shared_ptr<dcp::SubtitleImage> si = dynamic_pointer_cast<dcp::SubtitleImage>(subs.subtitles().front());
 	BOOST_REQUIRE (si);
-	BOOST_CHECK (si->png_image() == dcp::Data("test/data/sub.png"));
+	BOOST_CHECK (si->png_image() == dcp::ArrayData("test/data/sub.png"));
 }
diff --git a/test/read_smpte_subtitle_test.cc b/test/read_smpte_subtitle_test.cc
index ca08e117..9cf1451d 100644
--- a/test/read_smpte_subtitle_test.cc
+++ b/test/read_smpte_subtitle_test.cc
@@ -129,5 +129,5 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test3)
 	BOOST_REQUIRE_EQUAL (subs.subtitles().size(), 1);
 	shared_ptr<dcp::SubtitleImage> si = dynamic_pointer_cast<dcp::SubtitleImage>(subs.subtitles().front());
 	BOOST_REQUIRE (si);
-	BOOST_CHECK (si->png_image() == dcp::Data("test/data/sub.png"));
+	BOOST_CHECK (si->png_image() == dcp::ArrayData("test/data/sub.png"));
 }
diff --git a/test/test.cc b/test/test.cc
index 25d7726d..245dd91c 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -344,7 +344,7 @@ make_simple_with_interop_subs (boost::filesystem::path path)
 	subs->add (simple_subtitle());
 
 	boost::filesystem::create_directory (path / "subs");
-	dcp::Data data(4096);
+	dcp::ArrayData data(4096);
 	data.write (path / "subs" / "font.ttf");
 	subs->add_font ("afont", path / "subs" / "font.ttf");
 	subs->write (path / "subs" / "subs.xml");
@@ -364,7 +364,7 @@ make_simple_with_smpte_subs (boost::filesystem::path path)
 	shared_ptr<dcp::SMPTESubtitleAsset> subs(new dcp::SMPTESubtitleAsset());
 	subs->add (simple_subtitle());
 
-	dcp::Data data(4096);
+	dcp::ArrayData data(4096);
 	subs->write (path / "subs.mxf");
 
 	shared_ptr<dcp::ReelSubtitleAsset> reel_subs(new dcp::ReelSubtitleAsset(subs, dcp::Fraction(24, 1), 240, 0));
@@ -422,7 +422,7 @@ shared_ptr<dcp::ReelAsset>
 black_picture_asset (boost::filesystem::path dir, int frames)
 {
 	shared_ptr<dcp::OpenJPEGImage> image = black_image ();
-	dcp::Data frame = dcp::compress_j2k (image, 100000000, 24, false, false);
+	dcp::ArrayData frame = dcp::compress_j2k (image, 100000000, 24, false, false);
 	BOOST_REQUIRE (frame.size() < 230000000 / (24 * 8));
 
 	shared_ptr<dcp::MonoPictureAsset> asset(new dcp::MonoPictureAsset(dcp::Fraction(24, 1), dcp::SMPTE));
diff --git a/test/test.h b/test/test.h
index 9009a58b..ea697e40 100644
--- a/test/test.h
+++ b/test/test.h
@@ -19,7 +19,6 @@
 
 
 #include "cpl.h"
-#include "data.h"
 #include "dcp.h"
 #include "reel.h"
 #include "reel_subtitle_asset.h"
diff --git a/test/verify_test.cc b/test/verify_test.cc
index 645393a0..3e2a665f 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -509,7 +509,7 @@ BOOST_AUTO_TEST_CASE (verify_test14)
 
 static
 void
-dcp_from_frame (dcp::Data const& frame, boost::filesystem::path dir)
+dcp_from_frame (dcp::ArrayData const& frame, boost::filesystem::path dir)
 {
 	shared_ptr<dcp::MonoPictureAsset> asset(new dcp::MonoPictureAsset(dcp::Fraction(24, 1), dcp::SMPTE));
 	boost::filesystem::create_directories (dir);
@@ -537,11 +537,11 @@ BOOST_AUTO_TEST_CASE (verify_test15)
 
 	/* Compress a black image */
 	shared_ptr<dcp::OpenJPEGImage> image = black_image ();
-	dcp::Data frame = dcp::compress_j2k (image, 100000000, 24, false, false);
+	dcp::ArrayData frame = dcp::compress_j2k (image, 100000000, 24, false, false);
 	BOOST_REQUIRE (frame.size() < too_big);
 
 	/* Place it in a bigger block with some zero padding at the end */
-	dcp::Data oversized_frame(too_big);
+	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());
 
@@ -564,11 +564,11 @@ BOOST_AUTO_TEST_CASE (verify_test16)
 
 	/* Compress a black image */
 	shared_ptr<dcp::OpenJPEGImage> image = black_image ();
-	dcp::Data frame = dcp::compress_j2k (image, 100000000, 24, false, false);
+	dcp::ArrayData frame = dcp::compress_j2k (image, 100000000, 24, false, false);
 	BOOST_REQUIRE (frame.size() < nearly_too_big);
 
 	/* Place it in a bigger block with some zero padding at the end */
-	dcp::Data oversized_frame(nearly_too_big);
+	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());
 
@@ -589,7 +589,7 @@ BOOST_AUTO_TEST_CASE (verify_test17)
 {
 	/* Compress a black image */
 	shared_ptr<dcp::OpenJPEGImage> image = black_image ();
-	dcp::Data frame = dcp::compress_j2k (image, 100000000, 24, false, false);
+	dcp::ArrayData frame = dcp::compress_j2k (image, 100000000, 24, false, false);
 	BOOST_REQUIRE (frame.size() < 230000000 / (24 * 8));
 
 	boost::filesystem::path const dir("build/test/verify_test17");
@@ -716,7 +716,7 @@ BOOST_AUTO_TEST_CASE (verify_test22)
 	boost::filesystem::create_directories (ov_dir);
 
 	shared_ptr<dcp::OpenJPEGImage> image = black_image ();
-	dcp::Data frame = dcp::compress_j2k (image, 100000000, 24, false, false);
+	dcp::ArrayData frame = dcp::compress_j2k (image, 100000000, 24, false, false);
 	BOOST_REQUIRE (frame.size() < 230000000 / (24 * 8));
 	dcp_from_frame (frame, ov_dir);
 
diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc
index 4bdc6e9d..1f5ded21 100644
--- a/test/write_subtitle_test.cc
+++ b/test/write_subtitle_test.cc
@@ -341,7 +341,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
 	c->add (
 		shared_ptr<dcp::Subtitle> (
 			new dcp::SubtitleImage (
-				dcp::Data ("test/data/sub.png"),
+				dcp::ArrayData ("test/data/sub.png"),
 				dcp::Time (0, 4,  9, 22, 24),
 				dcp::Time (0, 4, 11, 22, 24),
 				0,
@@ -705,7 +705,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test3)
 	c.add (
 		shared_ptr<dcp::Subtitle> (
 			new dcp::SubtitleImage (
-				dcp::Data ("test/data/sub.png"),
+				dcp::ArrayData ("test/data/sub.png"),
 				dcp::Time (0, 4,  9, 22, 24),
 				dcp::Time (0, 4, 11, 22, 24),
 				0,