Fix assertion failure on opening content properties (#816).

[dcpomatic.git] / src / lib / j2k_image_proxy.cc

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 35073201c121a6e6a693e43bb64b183bb5f8d8b2..0e4d3ca2f21319e494324b32a1c50472230a1cbe 100644 (file)
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -20,15 +20,14 @@
 #include "j2k_image_proxy.h"
 #include "dcpomatic_socket.h"
 #include "image.h"
-#include "data.h"
 #include "raw_convert.h"
 #include <dcp/openjpeg_image.h>
 #include <dcp/mono_picture_frame.h>
 #include <dcp/stereo_picture_frame.h>
 #include <dcp/colour_conversion.h>
 #include <dcp/rgb_xyz.h>
+#include <dcp/j2k.h>
 #include <libcxml/cxml.h>
-#include <openjpeg.h>
 #include <libxml++/libxml++.h>
 #include <iostream>
 
@@ -39,6 +38,7 @@ using std::cout;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
+using dcp::Data;
 
 /** Construct a J2KImageProxy from a JPEG2000 file */
 J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size)
@@ -94,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) {
@@ -164,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;
        }