diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-01-13 23:34:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-01-15 10:21:59 +0100 |
| commit | db22f81ccce9e1a5f205e6d8b3c0631fc039a173 (patch) | |
| tree | 263c2a28165fe5d3cf03bae25d19cd60b0640bfd /src/lib/dcp_decoder.cc | |
| parent | 7a301e22de2a3c47a81ebc4c9f19b68131b482aa (diff) | |
Fix handling of empty font IDs and default DCP fonts (#2721) (part of #2722).
Previously we used an empty font ID as the default for when a subtitle
has no Font, but in #2721 we saw a DCP with an empty font ID which
raised an assertion (because we'd already added our default font with
the empty ID).
Here we try to fix this (and also make the default font correctly be
that from the first <LoadFont>).
Diffstat (limited to 'src/lib/dcp_decoder.cc')
| -rw-r--r-- | src/lib/dcp_decoder.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index 3a1871863..24ff507e6 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -314,7 +314,11 @@ DCPDecoder::pass_texts ( } dcp::SubtitleString is_copy = *is; - is_copy.set_font(_font_id_allocator.font_id(_reel - _reels.begin(), asset->id(), is_copy.font().get_value_or(""))); + if (is_copy.font()) { + is_copy.set_font(_font_id_allocator.font_id(_reel - _reels.begin(), asset->id(), is_copy.font().get())); + } else { + is_copy.set_font(_font_id_allocator.default_font_id()); + } strings.push_back(is_copy); } |