Try to add basic decryption support to dcpdiff.

[libdcp.git] / src / picture_mxf.cc

diff --git a/src/picture_mxf.cc b/src/picture_mxf.cc
index 1f863eb1272030cfdfaecf7b9e4df09690742437..46aa7752847aa539aaeb790194ccfcf7b293a311 100644 (file)
--- a/src/picture_mxf.cc
+++ b/src/picture_mxf.cc
@@ -20,7 +20,7 @@
 #include "picture_mxf.h"
 #include "util.h"
 #include "exceptions.h"
-#include "xyz_frame.h"
+#include "xyz_image.h"
 #include "picture_mxf_writer.h"
 #include "compose.hpp"
 #include "AS_DCP.h"
@@ -71,7 +71,7 @@ PictureMXF::read_picture_descriptor (ASDCP::JP2K::PictureDescriptor const & desc
 
 bool
 PictureMXF::descriptor_equals (
-       ASDCP::JP2K::PictureDescriptor const & a, ASDCP::JP2K::PictureDescriptor const & b, boost::function<void (NoteType, string)> note
+       ASDCP::JP2K::PictureDescriptor const & a, ASDCP::JP2K::PictureDescriptor const & b, NoteHandler note
        ) const
 {
        if (
@@ -113,7 +113,7 @@ PictureMXF::descriptor_equals (
 
 bool
 PictureMXF::frame_buffer_equals (
-       int frame, EqualityOptions opt, boost::function<void (NoteType, string)> note,
+       int frame, EqualityOptions opt, NoteHandler note,
        uint8_t const * data_A, unsigned int size_A, uint8_t const * data_B, unsigned int size_B
        ) const
 {
@@ -124,8 +124,8 @@ PictureMXF::frame_buffer_equals (
        }
                
        /* Decompress the images to bitmaps */
-       shared_ptr<XYZFrame> image_A = decompress_j2k (const_cast<uint8_t*> (data_A), size_A, 0);
-       shared_ptr<XYZFrame> image_B = decompress_j2k (const_cast<uint8_t*> (data_B), size_B, 0);
+       shared_ptr<XYZImage> image_A = decompress_j2k (const_cast<uint8_t*> (data_A), size_A, 0);
+       shared_ptr<XYZImage> image_B = decompress_j2k (const_cast<uint8_t*> (data_B), size_B, 0);
        
        /* Compare them */