From a0411faf17cf5fe539c30349b65ac24b2bd004ae Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 3 Dec 2022 10:15:05 +0100 Subject: [PATCH] Bump libsub for libdcp dependency removal. --- cscript | 2 +- src/lib/text_decoder.cc | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cscript b/cscript index 5514c2ae7..11f3c9bef 100644 --- a/cscript +++ b/cscript @@ -454,7 +454,7 @@ def dependencies(target, options): deps = [] deps.append(('libdcp', 'v1.8.34')) - deps.append(('libsub', 'v1.6.40')) + deps.append(('libsub', 'v1.6.41')) deps.append(('leqm-nrt', '93ae9e6')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc index 750deb9b3..6fd036ae1 100644 --- a/src/lib/text_decoder.cc +++ b/src/lib/text_decoder.cc @@ -226,12 +226,16 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subti content by the other emit_plain_start() above. */ + auto dcp_colour = [](sub::Colour const& c) { + return dcp::Colour(lrintf(c.r * 255), lrintf(c.g * 255), lrintf(c.b * 255)); + }; + auto dcp_subtitle = dcp::SubtitleString( optional(), block.italic, block.bold, block.underline, - block.colour.dcp(), + dcp_colour(block.colour), block.font_size.points (72 * 11), 1.0, dcp::Time (from.seconds(), 1000), @@ -245,7 +249,7 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subti dcp::Direction::LTR, block.text, dcp::Effect::NONE, - block.effect_colour.get_value_or(sub::Colour(0, 0, 0)).dcp(), + dcp_colour(block.effect_colour.get_value_or(sub::Colour(0, 0, 0))), /* Hack: we should use subtitle.fade_up and subtitle.fade_down here but the times of these often don't have a frame rate associated with them so the sub::Time won't convert them to milliseconds without -- 2.30.2