diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-02 12:06:20 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-02 12:06:20 +0100 |
| commit | 3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0 (patch) | |
| tree | 24e46f4f566bfb98aa48e9dab602ec1c8d0591d6 /test/client_server_test.cc | |
| parent | 24d54ea7fe1ba128cf8d3521d6738fc73a7c623e (diff) | |
| parent | 8fb0f4eaa6d91ca9369f45dd7a57c29149edaaac (diff) | |
Merge master.
Diffstat (limited to 'test/client_server_test.cc')
| -rw-r--r-- | test/client_server_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 8e4fb0e18..c0eddd8f6 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -78,9 +78,11 @@ BOOST_AUTO_TEST_CASE (client_server_test) p += sub_image->stride()[0]; } + shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test.log")); + shared_ptr<PlayerVideoFrame> pvf ( new PlayerVideoFrame ( - shared_ptr<ImageProxy> (new RawImageProxy (image)), + shared_ptr<ImageProxy> (new RawImageProxy (image, log)), Crop (), dcp::Size (1998, 1080), dcp::Size (1998, 1080), @@ -93,8 +95,6 @@ BOOST_AUTO_TEST_CASE (client_server_test) pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60))); - shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test.log")); - shared_ptr<DCPVideoFrame> frame ( new DCPVideoFrame ( pvf, |