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
/
subtitle_content.cc
diff --git
a/src/lib/subtitle_content.cc
b/src/lib/subtitle_content.cc
index 0abb7d491ec57ffff13e2d483fc67e282fd473fb..783c73e254aaa75b743adae6b5c5851b84d4b3b7 100644
(file)
--- a/
src/lib/subtitle_content.cc
+++ b/
src/lib/subtitle_content.cc
@@
-18,7
+18,7
@@
*/
#include <libcxml/cxml.h>
*/
#include <libcxml/cxml.h>
-#include <
lib
dcp/raw_convert.h>
+#include <dcp/raw_convert.h>
#include "subtitle_content.h"
#include "util.h"
#include "exceptions.h"
#include "subtitle_content.h"
#include "util.h"
#include "exceptions.h"
@@
-27,9
+27,10
@@
using std::string;
using std::vector;
using std::string;
using std::vector;
+using std::cout;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
-using
lib
dcp::raw_convert;
+using dcp::raw_convert;
int const SubtitleContentProperty::SUBTITLE_X_OFFSET = 500;
int const SubtitleContentProperty::SUBTITLE_Y_OFFSET = 501;
int const SubtitleContentProperty::SUBTITLE_X_OFFSET = 500;
int const SubtitleContentProperty::SUBTITLE_Y_OFFSET = 501;