From 939ca70fbee78b5a799824b1d044023ed84cda12 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 2 Nov 2022 23:08:39 +0100 Subject: [PATCH] fixup! Bump libdcp for subtitle Z-position fixes (#2356). --- src/lib/reel_writer.cc | 3 ++- src/lib/text_decoder.cc | 1 + test/render_subtitles_test.cc | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 4227a45fd..f9e29a16f 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -871,6 +871,7 @@ ReelWriter::empty_text_asset (TextType type, optional track, bool dcp::HAlign::CENTER, 0.5, dcp::VAlign::CENTER, + 0, dcp::Direction::LTR, " ", dcp::Effect::NONE, @@ -940,7 +941,7 @@ ReelWriter::write (PlayerText subs, TextType type, optional track, image_as_png(i.image), dcp::Time(period.from.seconds() - _period.from.seconds(), tcr), dcp::Time(period.to.seconds() - _period.from.seconds(), tcr), - i.rectangle.x, dcp::HAlign::LEFT, i.rectangle.y, dcp::VAlign::TOP, + i.rectangle.x, dcp::HAlign::LEFT, i.rectangle.y, dcp::VAlign::TOP, 0, dcp::Time(), dcp::Time() ) ); diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc index fa5ed6c7a..4b521ede7 100644 --- a/src/lib/text_decoder.cc +++ b/src/lib/text_decoder.cc @@ -255,6 +255,7 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subti h_align, v_position, v_align, + 0, dcp::Direction::LTR, escape_text(block.text), dcp::Effect::NONE, diff --git a/test/render_subtitles_test.cc b/test/render_subtitles_test.cc index 282c9311f..e5de60c4e 100644 --- a/test/render_subtitles_test.cc +++ b/test/render_subtitles_test.cc @@ -55,6 +55,7 @@ add (std::list& s, std::string text, bool italic, bool bold, bool un dcp::HAlign::LEFT, 1, dcp::VAlign::TOP, + 0, dcp::Direction::LTR, text, dcp::Effect::NONE, -- 2.30.2