summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-05-05 23:06:05 +0200
committerCarl Hetherington <cth@carlh.net>2022-05-05 23:06:05 +0200
commit58d89ba0632d94504b15dc10cb4e4153808f8efe (patch)
tree39822d27b2bce1898a527fd324d383eb9deb5997
parent26866fdeba6dd868b1809de49799690555164f70 (diff)
Update for change to libdcp API.
-rw-r--r--cscript4
-rw-r--r--src/lib/image.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/cscript b/cscript
index fb76e1d5f..b453ddf80 100644
--- a/cscript
+++ b/cscript
@@ -427,8 +427,8 @@ def dependencies(target, options):
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', 'v1.8.18'))
- deps.append(('libsub', 'v1.6.19'))
+ deps.append(('libdcp', 'f031667bd2769d3daf9c49115f21a099fafcee46'))
+ deps.append(('libsub', '7ed26aa4ddb33c9c01a3a22fe99c7759321b1246'))
deps.append(('leqm-nrt', '93ae9e6'))
deps.append(('rtaudio', 'f619b76'))
# We get our OpenSSL libraries from the environment, but we
diff --git a/src/lib/image.cc b/src/lib/image.cc
index 799d7af49..7b95e6766 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -715,8 +715,8 @@ Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
auto conv = dcp::ColourConversion::srgb_to_xyz();
double fast_matrix[9];
dcp::combined_rgb_to_xyz (conv, fast_matrix);
- double const * lut_in = conv.in()->lut (8, false);
- double const * lut_out = conv.out()->lut (16, true);
+ auto lut_in = conv.in()->lut(0, 1, 8, false);
+ auto lut_out = conv.out()->lut(0, 1, 16, true);
int const this_bpp = 6;
for (int ty = start_ty, oy = start_oy; ty < size().height && oy < other->size().height; ++ty, ++oy) {
uint16_t* tp = reinterpret_cast<uint16_t*> (data()[0] + ty * stride()[0] + start_tx * this_bpp);