projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
[dcpomatic.git]
/
src
/
lib
/
render_subtitles.h
diff --git
a/src/lib/render_subtitles.h
b/src/lib/render_subtitles.h
index 218b866e95cd238bcc96307b5ed0720267d52d43..dbde8011594553b2dd2cf05ca96da4ebed42747e 100644
(file)
--- a/
src/lib/render_subtitles.h
+++ b/
src/lib/render_subtitles.h
@@
-21,4
+21,4
@@
#include <dcp/subtitle_string.h>
#include <dcp/util.h>
-
PositionImage
render_subtitles (std::list<dcp::SubtitleString>, dcp::Size);
+
std::list<PositionImage>
render_subtitles (std::list<dcp::SubtitleString>, dcp::Size);