summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-11-29 23:45:59 +0000
committerCarl Hetherington <cth@carlh.net>2015-12-04 21:12:46 +0000
commitd4a2e054dee6ee80b578500e47f4eaf84731f140 (patch)
treebcbf36b8e6b64800e01dd3cd0b440e1cf1a52bf8 /test
parent660f1059c3b2c1ee08cd390cf6d5a0b5900a7edc (diff)
Take DCP-o-matic's version of Data class.
Diffstat (limited to 'test')
-rw-r--r--test/bench.cc2
-rw-r--r--test/dcp_font_test.cc6
2 files changed, 4 insertions, 4 deletions
diff --git a/test/bench.cc b/test/bench.cc
index e76b3a97..be66f908 100644
--- a/test/bench.cc
+++ b/test/bench.cc
@@ -96,6 +96,6 @@ main (int argc, char* argv[])
cout << "Compress: " << count / compress.get() << " fps.\n";
FILE* f = fopen ("check.j2c", "wb");
- fwrite (recomp.data.get(), 1, recomp.size, f);
+ fwrite (recomp.data().get(), 1, recomp.size(), f);
fclose (f);
}
diff --git a/test/dcp_font_test.cc b/test/dcp_font_test.cc
index daa16940..83aef255 100644
--- a/test/dcp_font_test.cc
+++ b/test/dcp_font_test.cc
@@ -69,7 +69,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().get(), ref.get(), size), 0);
}
/** Create a DCP with SMPTE subtitles and check that the font is written and read back correctly */
@@ -106,6 +106,6 @@ BOOST_AUTO_TEST_CASE (smpte_dcp_font_test)
fread (ref.get(), 1, size, f);
fclose (f);
- BOOST_REQUIRE (subs2->_fonts.front().data.data);
- BOOST_CHECK_EQUAL (memcmp (subs2->_fonts.front().data.data.get(), ref.get(), size), 0);
+ BOOST_REQUIRE (subs2->_fonts.front().data.data());
+ BOOST_CHECK_EQUAL (memcmp (subs2->_fonts.front().data.data().get(), ref.get(), size), 0);
}