summaryrefslogtreecommitdiff
path: root/test/subtitle_font_id_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-06-10 01:05:43 +0200
committerCarl Hetherington <cth@carlh.net>2024-06-11 09:52:28 +0200
commita224ef26f48e1a9a9189c2b935abb06147b342bc (patch)
tree86d3facabe1beb33d87fa99c35200abc9ac8cb4f /test/subtitle_font_id_test.cc
parentf37099ba3e9157c3ef74ffcc87c34d3fc54ccfe5 (diff)
Simplify the FontIDAllocator a lot (#2827).
This is at the expense of forward compatibility, and the need to re-examine subtitle content (losing custom fonts as we do so). But it does mean that the code is simpler, and there's not this weird growth of IDs where a DCP gets imported with some font, and then the ID becomes 0_font, and if you do it again it's 0_0_font, and so on.
Diffstat (limited to 'test/subtitle_font_id_test.cc')
-rw-r--r--test/subtitle_font_id_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/subtitle_font_id_test.cc b/test/subtitle_font_id_test.cc
index a93145163..49ad4ea05 100644
--- a/test/subtitle_font_id_test.cc
+++ b/test/subtitle_font_id_test.cc
@@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE(full_dcp_subtitle_font_id_test)
BOOST_REQUIRE_EQUAL(text->fonts().size(), 1U);
auto font = text->fonts().front();
- BOOST_CHECK_EQUAL(font->id(), "0_theFontId");
+ BOOST_CHECK_EQUAL(font->id(), "theFontId");
BOOST_REQUIRE(font->data());
BOOST_CHECK_EQUAL(font->data()->size(), 367112);
}
@@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(dcp_subtitle_font_id_test)
BOOST_REQUIRE_EQUAL(text->fonts().size(), 1U);
auto font = text->fonts().front();
- BOOST_CHECK_EQUAL(font->id(), "0_theFontId");
+ BOOST_CHECK_EQUAL(font->id(), "theFontId");
BOOST_REQUIRE(font->data());
BOOST_CHECK_EQUAL(font->data()->size(), 367112);
}