projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
test
/
client_server_test.cc
diff --git
a/test/client_server_test.cc
b/test/client_server_test.cc
index 8e4fb0e1867e845e644864012eae8812b2468183..c0eddd8f6a7f8eee16dcbbef3d27119a2cf45898 100644
(file)
--- 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];
}
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<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),
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)));
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,
shared_ptr<DCPVideoFrame> frame (
new DCPVideoFrame (
pvf,