diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-12-04 11:35:41 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-12-04 21:14:06 +0000 |
| commit | 443371c61c7fe263140372bcbc72206b27585077 (patch) | |
| tree | bc532257313e158ccee5ba27ccc5ce74742410cb /src | |
| parent | 342326b363ca8c5f49fa12509cdd07931e86bcf4 (diff) | |
Build fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/dcp_video.cc | 1 | ||||
| -rw-r--r-- | src/lib/environment_info.cc | 4 | ||||
| -rw-r--r-- | src/lib/image_examiner.cc | 1 | ||||
| -rw-r--r-- | src/lib/j2k_image_proxy.cc | 7 |
4 files changed, 5 insertions, 8 deletions
diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index 9861e5a1a..acc389d96 100644 --- a/src/lib/dcp_video.cc +++ b/src/lib/dcp_video.cc @@ -44,7 +44,6 @@ #include <dcp/rgb_xyz.h> #include <dcp/j2k.h> #include <dcp/colour_matrix.h> -#include <openjpeg.h> #include <libxml++/libxml++.h> #include <boost/asio.hpp> #include <boost/thread.hpp> diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc index ecb80fc14..f8d0a75d1 100644 --- a/src/lib/environment_info.cc +++ b/src/lib/environment_info.cc @@ -22,7 +22,6 @@ #include "version.h" #include "cross.h" #include <dcp/version.h> -#include <openjpeg.h> #include <libssh/libssh.h> #ifdef DCPOMATIC_IMAGE_MAGICK #include <magick/MagickCore.h> @@ -69,8 +68,7 @@ string dependency_version_summary () { SafeStringStream s; - s << N_("libopenjpeg ") << opj_version () << N_(", ") - << N_("libavcodec ") << ffmpeg_version_to_string (avcodec_version()) << N_(", ") + s << N_("libavcodec ") << ffmpeg_version_to_string (avcodec_version()) << N_(", ") << N_("libavfilter ") << ffmpeg_version_to_string (avfilter_version()) << N_(", ") << N_("libavformat ") << ffmpeg_version_to_string (avformat_version()) << N_(", ") << N_("libavutil ") << ffmpeg_version_to_string (avutil_version()) << N_(", ") diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc index 73d004d7f..7b02de956 100644 --- a/src/lib/image_examiner.cc +++ b/src/lib/image_examiner.cc @@ -27,6 +27,7 @@ #include "compose.hpp" #include <dcp/openjpeg_image.h> #include <dcp/exceptions.h> +#include <dcp/j2k.h> #include <Magick++.h> #include <iostream> diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index f2434b23d..0e4d3ca2f 100644 --- a/src/lib/j2k_image_proxy.cc +++ b/src/lib/j2k_image_proxy.cc @@ -28,7 +28,6 @@ #include <dcp/rgb_xyz.h> #include <dcp/j2k.h> #include <libcxml/cxml.h> -#include <openjpeg.h> #include <libxml++/libxml++.h> #include <iostream> @@ -95,8 +94,8 @@ J2KImageProxy::image (optional<dcp::NoteHandler>) const { ensure_j2k (); - if (_j2k->opj_image()->comps[0].prec < 12) { - int const shift = 12 - _j2k->opj_image()->comps[0].prec; + if (_j2k->precision(0) < 12) { + int const shift = 12 - _j2k->precision (0); for (int c = 0; c < 3; ++c) { int* p = _j2k->data (c); for (int y = 0; y < _j2k->size().height; ++y) { @@ -165,7 +164,7 @@ J2KImageProxy::pixel_format () const { ensure_j2k (); - if (_j2k->opj_image()->color_space == CLRSPC_SRGB) { + if (_j2k->srgb ()) { return AV_PIX_FMT_RGB48LE; } |