projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use uchardet to guess encoding of subtitle files and reject non-UTF-8.
[dcpomatic.git]
/
src
/
lib
/
render_subtitles.h
diff --git
a/src/lib/render_subtitles.h
b/src/lib/render_subtitles.h
index 895a6fd258d72578dde34c7cc0560ba679cc83b7..22e5885ddec9f923e3b17abfce8a8e6a097ce1a7 100644
(file)
--- a/
src/lib/render_subtitles.h
+++ b/
src/lib/render_subtitles.h
@@
-17,11
+17,10
@@
*/
*/
-#include
<libdcp/subtitle_string.h>
-#include <
libdcp/util
.h>
-#include
"position.h"
+#include
"position_image.h"
+#include <
dcp/subtitle_string
.h>
+#include
<dcp/util.h>
-class
Image
;
+class
Font
;
-void
-render_subtitles (std::list<dcp::SubtitleString>, dcp::Size, boost::shared_ptr<Image> &, Position<int> &);
+std::list<PositionImage> render_subtitles (std::list<dcp::SubtitleString>, std::list<boost::shared_ptr<Font> > fonts, dcp::Size);