diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-11 14:29:55 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-11 14:29:55 +0100 |
| commit | b655bd3359e9a014da68cd9f61e2a5b1d233247d (patch) | |
| tree | 42ab16fdc9621fd0314a71f051804cdacd1cb823 /test/client_server_test.cc | |
| parent | e64acff7da897cd03d88aa9e8e21682545a61cc2 (diff) | |
| parent | 2514ffcd1adcca4fc8e3db894afb5cdc6c857e94 (diff) | |
Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
Diffstat (limited to 'test/client_server_test.cc')
| -rw-r--r-- | test/client_server_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 51b52331a..232190286 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE (client_server_test) p += sub_image->stride()[0]; } - shared_ptr<Subtitle> subtitle (new Subtitle (Position (50, 60), sub_image)); +// shared_ptr<Subtitle> subtitle (new Subtitle (Position<int> (50, 60), sub_image)); shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test.log")); |