projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
736a4f2
)
Fix test for change to marked_up.
author
Carl Hetherington
<cth@carlh.net>
Wed, 14 Dec 2016 12:01:44 +0000
(12:01 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 14 Dec 2016 12:01:44 +0000
(12:01 +0000)
src/lib/render_subtitles.h
patch
|
blob
|
history
diff --git
a/src/lib/render_subtitles.h
b/src/lib/render_subtitles.h
index f539896ce7d7c13ecb18cd98ae41c67a74cf8582..02bf3ec656c45b6bb4409ac21a00fa4150321f3b 100644
(file)
--- a/
src/lib/render_subtitles.h
+++ b/
src/lib/render_subtitles.h
@@
-25,7
+25,7
@@
class Font;
-std::string marked_up (std::list<SubtitleString> subtitles, int target_height);
+std::string marked_up (std::list<SubtitleString> subtitles, int target_height
, float fade_factor
);
std::list<PositionImage> render_subtitles (
std::list<SubtitleString>, std::list<boost::shared_ptr<Font> > fonts, dcp::Size, DCPTime
);