Tidy up J2KImageProxy a bit.

1 files changed, 6 insertions, 9 deletions

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 396e6609f..511e913d9 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -41,14 +41,13 @@ using boost::thread;
 using boost::optional;
 
 void
-do_remote_encode (shared_ptr<DCPVideo> frame, ServerDescription description, shared_ptr<Data> locally_encoded)
+do_remote_encode (shared_ptr<DCPVideo> frame, ServerDescription description, Data locally_encoded)
 {
-	shared_ptr<Data> remotely_encoded;
+	Data remotely_encoded;
 	BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description));
-	BOOST_CHECK (remotely_encoded);
 	
-	BOOST_CHECK_EQUAL (locally_encoded->size(), remotely_encoded->size());
-	BOOST_CHECK_EQUAL (memcmp (locally_encoded->data().get(), remotely_encoded->data().get(), locally_encoded->size()), 0);
+	BOOST_CHECK_EQUAL (locally_encoded.size(), remotely_encoded.size());
+	BOOST_CHECK_EQUAL (memcmp (locally_encoded.data().get(), remotely_encoded.data().get(), locally_encoded.size()), 0);
 }
 
 BOOST_AUTO_TEST_CASE (client_server_test_rgb)
@@ -109,8 +108,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 			)
 		);
 
-	shared_ptr<Data> locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
-	BOOST_ASSERT (locally_encoded);
+	Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
 	
 	Server* server = new Server (log, true);
 
@@ -192,8 +190,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 			)
 		);
 
-	shared_ptr<Data> locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
-	BOOST_ASSERT (locally_encoded);
+	Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
 	
 	Server* server = new Server (log, true);