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/data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/data') diff --git a/test/data b/test/data index c0f7e2c3f..c40dcfabf 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit c0f7e2c3f702b469db8e146eb9e650f9998d18a7 +Subproject commit c40dcfabfccce346822a662012fa86814206d6a8 -- cgit v1.2.3