From 37b381e63e202c4b6cb86a22fd9f5c256f1671f2 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 2 Nov 2022 22:39:49 +0100
Subject: [PATCH] Bump libdcp for subtitle Z-position fixes (#2356).

---
 cscript                       | 4 ++--
 src/lib/reel_writer.cc        | 3 ++-
 src/lib/text_decoder.cc       | 1 +
 test/render_subtitles_test.cc | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cscript b/cscript
index f0f0d3fbf..ea99aaf1d 100644
--- a/cscript
+++ b/cscript
@@ -451,8 +451,8 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.32'))
-    deps.append(('libsub', 'v1.6.35'))
+    deps.append(('libdcp', 'v1.8.33'))
+    deps.append(('libsub', 'v1.6.36'))
     deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
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<DCPTextTrack> 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<DCPTextTrack> 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<StringText>& 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