projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ddf7684
)
Don't try to add fonts from an asset that we don't have.
author
Carl Hetherington
<cth@carlh.net>
Fri, 29 Dec 2023 00:30:22 +0000
(
01:30
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 4 Jan 2024 22:35:44 +0000
(23:35 +0100)
src/lib/font_id_allocator.cc
patch
|
blob
|
history
diff --git
a/src/lib/font_id_allocator.cc
b/src/lib/font_id_allocator.cc
index 70eda2b0613caa2402a24502d9e89d7a769073ed..c566c3676c956f9685f92d455e5261cfabfc2ce9 100644
(file)
--- a/
src/lib/font_id_allocator.cc
+++ b/
src/lib/font_id_allocator.cc
@@
-44,11
+44,15
@@
FontIDAllocator::add_fonts_from_reels(vector<shared_ptr<dcp::Reel>> const& reels
int reel_index = 0;
for (auto reel: reels) {
if (auto sub = reel->main_subtitle()) {
- add_fonts_from_asset(reel_index, sub->asset());
+ if (sub->asset_ref().resolved()) {
+ add_fonts_from_asset(reel_index, sub->asset());
+ }
}
for (auto ccap: reel->closed_captions()) {
- add_fonts_from_asset(reel_index, ccap->asset());
+ if (ccap->asset_ref().resolved()) {
+ add_fonts_from_asset(reel_index, ccap->asset());
+ }
}
++reel_index;