From 577602f032c0a129612efc8015f846f4bf6e64c9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 5 Apr 2023 22:25:03 +0200 Subject: [PATCH] Don't add fonts to SMPTE closed caption MXFs (#2505). --- src/lib/reel_writer.cc | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 8bd15a575..5d9f4dae0 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -491,16 +491,18 @@ maybe_add_text ( shared_ptr reel_asset; if (asset) { - if (film->interop()) { - if (chosen_interop_font) { - /* We only add one font, as Interop will ignore subsequent ones (and some validators will - * complain if they are even present) - */ - asset->add_font(fonts.get(chosen_interop_font), chosen_interop_font->data().get_value_or(default_font)); - } - } else { - for (auto const& font: fonts.map()) { - asset->add_font(font.second, font.first->data().get_value_or(default_font)); + if (!std::is_same::value) { + if (film->interop()) { + if (chosen_interop_font) { + /* We only add one font, as Interop will ignore subsequent ones (and some validators will + * complain if they are even present) + */ + asset->add_font(fonts.get(chosen_interop_font), chosen_interop_font->data().get_value_or(default_font)); + } + } else { + for (auto const& font: fonts.map()) { + asset->add_font(font.second, font.first->data().get_value_or(default_font)); + } } } -- 2.30.2