From 3c802dd6d1451c2c8a7e188f8379738d72e907eb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 14 Oct 2023 21:48:25 +0200 Subject: Fix DCP content font ID allocation to cope with DCPs that have multiple fonts with the same name in the same reel (#2600). Previously we had this id_for_font_in_reel() which would give an ID of N_font-ID. This means we got duplicate font IDs. Here we replace that method with FontAllocator, which gives an ID of N_font-ID for the first font and M_font-ID, where M is a number higher than the highest reel index. The idea is to support the required new IDs without breaking exisiting projects. There is some documentation of how it works in doc/design/fonts --- test/wscript | 1 + 1 file changed, 1 insertion(+) (limited to 'test/wscript') diff --git a/test/wscript b/test/wscript index f40568e3c..0c9db3889 100644 --- a/test/wscript +++ b/test/wscript @@ -99,6 +99,7 @@ def build(bld): film_metadata_test.cc find_missing_test.cc font_comparator_test.cc + font_id_allocator_test.cc frame_interval_checker_test.cc frame_rate_test.cc guess_crop_test.cc -- cgit v1.2.3