Update for change to libdcp API.

diff --git a/cscript b/cscript
index fb76e1d5f51ad9b71411e6ccbf5a303543d74795..b453ddf80a5f29211a4b868999dbd5fb4007ace9 100644 (file)
--- 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 799d7af49da172921006e664ef2044bd36ed179c..7b95e67669ae8ca73ba46bab0aaf8bd7a55a1525 100644 (file)
--- 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);