diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
| commit | 5b0e331380c83ec9835e8aa42fd342b2f0ad275d (patch) | |
| tree | 13c27f0b3420f5c3a268a5a22a9172675fdc370c /src/lib/image_examiner.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/lib/image_examiner.cc')
| -rw-r--r-- | src/lib/image_examiner.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc index 89d1517ce..d94891c6e 100644 --- a/src/lib/image_examiner.cc +++ b/src/lib/image_examiner.cc @@ -26,9 +26,9 @@ #include "exceptions.h" #include "config.h" #include "cross.h" -#include "compose.hpp" #include "ffmpeg_image_proxy.h" #include "image.h" +#include <dcp/compose.h> #include <dcp/openjpeg_image.h> #include <dcp/exceptions.h> #include <dcp/j2k_transcode.h> @@ -62,7 +62,7 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag _video_size = dcp::decompress_j2k (buffer, size, 0)->size (); } catch (dcp::ReadError& e) { delete[] buffer; - throw DecodeError (String::compose (_("Could not decode JPEG2000 file %1 (%2)"), path, e.what ())); + throw DecodeError (dcp::compose (_("Could not decode JPEG2000 file %1 (%2)"), path, e.what ())); } delete[] buffer; } else { |