X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=6b2e584a200af4bec0f4c70b30ec2d9dfdef9328;hb=7ec6c86c913fba820870565ee757fdf43ae47433;hp=89ee7f619728f0391fa78f2fcbf716e2174b72d8;hpb=d311043bf3c1e3e7f41b314f7ab7c91ed7e5aa7f;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index 89ee7f619..6b2e584a2 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -38,6 +38,7 @@
 #include "lib/job.h"
 #include "lib/job_manager.h"
 #include "lib/log_entry.h"
+#include "lib/make_dcp.h"
 #include "lib/ratio.h"
 #include "lib/signal_manager.h"
 #include "lib/util.h"
@@ -129,7 +130,7 @@ class TestSignalManager : public SignalManager
 {
 public:
 	/* No wakes in tests: we call ui_idle ourselves */
-	void wake_ui ()
+	void wake_ui () override
 	{
 
 	}
@@ -698,9 +699,9 @@ png_flush (png_structp)
 
 
 static void
-png_error_fn (png_structp png_ptr, char const * message)
+png_error_fn (png_structp, char const * message)
 {
-	reinterpret_cast<Image*>(png_get_error_ptr(png_ptr))->png_error (message);
+	throw EncodeError (String::compose("Error during PNG write: %1", message));
 }
 
 
@@ -893,7 +894,7 @@ void
 make_and_verify_dcp (shared_ptr<Film> film, vector<dcp::VerificationNote::Code> ignore)
 {
 	film->write_metadata ();
-	film->make_dcp (TranscodeJob::ChangedBehaviour::IGNORE);
+	make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE);
 	BOOST_REQUIRE (!wait_for_jobs());
 	auto notes = dcp::verify ({film->dir(film->dcp_name())}, &stage, &progress, TestPaths::xsd());
 	bool ok = true;