From db22f81ccce9e1a5f205e6d8b3c0631fc039a173 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 13 Jan 2024 23:34:35 +0100 Subject: 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 ). --- src/lib/dcp_subtitle_decoder.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/lib/dcp_subtitle_decoder.h') diff --git a/src/lib/dcp_subtitle_decoder.h b/src/lib/dcp_subtitle_decoder.h index 45a4999dd..9d0851253 100644 --- a/src/lib/dcp_subtitle_decoder.h +++ b/src/lib/dcp_subtitle_decoder.h @@ -19,8 +19,9 @@ */ -#include "text_decoder.h" #include "dcp_subtitle.h" +#include "font_id_allocator.h" +#include "text_decoder.h" class DCPSubtitleContent; @@ -44,4 +45,7 @@ private: std::vector>::const_iterator _next; dcp::SubtitleStandard _subtitle_standard; + + std::shared_ptr _asset; + FontIDAllocator _font_id_allocator; }; -- cgit v1.2.3