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.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/lib/image.cc')
| -rw-r--r-- | src/lib/image.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/image.cc b/src/lib/image.cc index 8e6c5717b..591727ba5 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -24,7 +24,6 @@ */ -#include "compose.hpp" #include "dcpomatic_socket.h" #include "exceptions.h" #include "image.h" @@ -32,6 +31,7 @@ #include "timer.h" #include "util.h" #include "warnings.h" +#include <dcp/compose.h> #include <dcp/rgb_xyz.h> #include <dcp/transfer_function.h> DCPOMATIC_DISABLE_WARNINGS @@ -1384,7 +1384,7 @@ png_error_fn (png_structp png_ptr, char const * message) void Image::png_error (char const * message) { - throw EncodeError (String::compose ("Error during PNG write: %1", message)); + throw EncodeError (dcp::compose ("Error during PNG write: %1", message)); } dcp::ArrayData |