projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge updated pot files.
[dcpomatic.git]
/
src
/
tools
/
servomatictest.cc
diff --git
a/src/tools/servomatictest.cc
b/src/tools/servomatictest.cc
index 91ad02120950346976b6e22b19ec2d75aca965d7..f5756c6939e7770fc12040838fc2c7b7c0030ad3 100644
(file)
--- a/
src/tools/servomatictest.cc
+++ b/
src/tools/servomatictest.cc
@@
-43,7
+43,7
@@
using std::pair;
using boost::shared_ptr;
static ServerDescription* server;
using boost::shared_ptr;
static ServerDescription* server;
-static
FileLog log_ ("servomatictest.log"
);
+static
shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log")
);
static int frame = 0;
void
static int frame = 0;
void
@@
-53,14
+53,14
@@
process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle> sub)
new DCPVideoFrame (
image, sub,
libdcp::Size (1024, 1024), 0, 0, 0,
new DCPVideoFrame (
image, sub,
libdcp::Size (1024, 1024), 0, 0, 0,
- Scaler::from_id ("bicubic"), frame, 24, "", 0, 250000000,
&
log_)
+ Scaler::from_id ("bicubic"), frame, 24, "", 0, 250000000, log_)
);
shared_ptr<DCPVideoFrame> remote (
new DCPVideoFrame (
image, sub,
libdcp::Size (1024, 1024), 0, 0, 0,
);
shared_ptr<DCPVideoFrame> remote (
new DCPVideoFrame (
image, sub,
libdcp::Size (1024, 1024), 0, 0, 0,
- Scaler::from_id ("bicubic"), frame, 24, "", 0, 250000000,
&
log_)
+ Scaler::from_id ("bicubic"), frame, 24, "", 0, 250000000, log_)
);
cout << "Frame " << frame << ": ";
);
cout << "Frame " << frame << ": ";