Build fixes.

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 9861e5a1a94224433863de276f572bafe7de566e..acc389d96cba5d684be4c79fe3c3de53fd4a72f6 100644 (file)
--- 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 ecb80fc148a50989fbcfd68fd72ecbbf62764d87..f8d0a75d13e13dbd112d80909e5528f2b13299a6 100644 (file)
--- 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 73d004d7f9571fafad9f601db9c5f1cb58700a90..7b02de956e033ff14a60810f732d82b6774412a6 100644 (file)
--- 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 f2434b23d49ec4e346afc188408ed527adeb6b66..0e4d3ca2f21319e494324b32a1c50472230a1cbe 100644 (file)
--- 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;
        }