summaryrefslogtreecommitdiff
path: root/src/lib/dcp_examiner.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-11-10 23:51:46 +0100
committerCarl Hetherington <cth@carlh.net>2023-11-17 00:24:35 +0100
commit2603a529a05905f133bd52271fb1298e9a4a4aa5 (patch)
treea5228a95d93ca9d077e37c41a88c919086bf263a /src/lib/dcp_examiner.cc
parent7a877ff976b119a39797c1f6e8477b92dfbb30ca (diff)
Always add a font with an empty ID (#2649).
It's not just subtitle files with no <LoadFont> that can have subtitles without a specified font. In particular, DoM makes a single space subtitle with no font spec when it creates filler subtitles in multi-reel DCPs.
Diffstat (limited to 'src/lib/dcp_examiner.cc')
-rw-r--r--src/lib/dcp_examiner.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 0f9ae9544..ca77f2db3 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -211,9 +211,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
for (auto const& font: asset->font_data()) {
_fonts.push_back({reel_index, asset->id(), make_shared<dcpomatic::Font>(font.first, font.second)});
}
- if (asset->font_data().empty()) {
- _fonts.push_back({reel_index, asset->id(), make_shared<dcpomatic::Font>("")});
- }
+ _fonts.push_back({reel_index, asset->id(), make_shared<dcpomatic::Font>("")});
}
_text_count[TextType::CLOSED_CAPTION] = std::max(_text_count[TextType::CLOSED_CAPTION], static_cast<int>(reel->closed_captions().size()));