diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-12-20 23:41:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-12-22 02:37:53 +0100 |
| commit | ddcd4f3ba0af3e9d49dbb68127317cd0d871a248 (patch) | |
| tree | 1091683b8dcaf82cd517b844be1d76f290f88f50 /src/lib/subtitle_encoder.h | |
| parent | bf4446523dd891049cabf1bcd68d20def57bc731 (diff) | |
Pass fonts from content around as FontData.
i.e. as a block of memory rather than a file. Also, get the
fonts from the decoder rather than the content.
Together, these changes allow us to use fonts from SMPTE DCPs
added as content. Before, fonts would be messed up in those
cases (#1885).
Diffstat (limited to 'src/lib/subtitle_encoder.h')
| -rw-r--r-- | src/lib/subtitle_encoder.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/subtitle_encoder.h b/src/lib/subtitle_encoder.h index 6484d1b0b..70b924564 100644 --- a/src/lib/subtitle_encoder.h +++ b/src/lib/subtitle_encoder.h @@ -58,4 +58,5 @@ private: int _reel_index; boost::optional<dcpomatic::DCPTime> _last; dcpomatic::DCPTime _length; + dcp::ArrayData _default_font; }; |
