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
/
render_subtitles.h
diff --git
a/src/lib/render_subtitles.h
b/src/lib/render_subtitles.h
index 743339bafc80b109be05e25d5c04549176ea509f..d83dc119a0d0a27de01e69eb6e9c957e098d5759 100644
(file)
--- a/
src/lib/render_subtitles.h
+++ b/
src/lib/render_subtitles.h
@@
-19,9
+19,6
@@
#include <dcp/subtitle_string.h>
#include <dcp/util.h>
#include <dcp/subtitle_string.h>
#include <dcp/util.h>
-#include "position.h"
+#include "position
_image
.h"
-class Image;
-
-void
-render_subtitles (std::list<dcp::SubtitleString>, dcp::Size, boost::shared_ptr<Image> &, Position<int> &);
+PositionImage render_subtitles (std::list<dcp::SubtitleString>, dcp::Size);