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]
/
src
/
lib
/
server.cc
diff --git
a/src/lib/server.cc
b/src/lib/server.cc
index 0c5792ae0da6b8d07d678e5244b6b04b381645e6..6bcff7e6e93db1204cfc2d2ec73c7179a99b55ce 100644
(file)
--- a/
src/lib/server.cc
+++ b/
src/lib/server.cc
@@
-29,7
+29,7
@@
#include <boost/algorithm/string.hpp>
#include <boost/scoped_array.hpp>
#include <libcxml/cxml.h>
#include <boost/algorithm/string.hpp>
#include <boost/scoped_array.hpp>
#include <libcxml/cxml.h>
-#include <
lib
dcp/raw_convert.h>
+#include <dcp/raw_convert.h>
#include "server.h"
#include "util.h"
#include "scaler.h"
#include "server.h"
#include "util.h"
#include "scaler.h"
@@
-56,8
+56,8
@@
using boost::thread;
using boost::bind;
using boost::scoped_array;
using boost::optional;
using boost::bind;
using boost::scoped_array;
using boost::optional;
-using
lib
dcp::Size;
-using
lib
dcp::raw_convert;
+using dcp::Size;
+using dcp::raw_convert;
Server::Server (shared_ptr<Log> log, bool verbose)
: _log (log)
Server::Server (shared_ptr<Log> log, bool verbose)
: _log (log)
@@
-85,7
+85,7
@@
Server::process (shared_ptr<Socket> socket, struct timeval& after_read, struct t
return -1;
}
return -1;
}
-
lib
dcp::Size size (
+ dcp::Size size (
xml->number_child<int> ("Width"), xml->number_child<int> ("Height")
);
xml->number_child<int> ("Width"), xml->number_child<int> ("Height")
);