Missing test files.

[libdcp.git] / test / decryption_test.cc

diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index 2f0bb420610ff4d8170d85d7f6dbf2d930a6dbf1..49fb3a92f4e7007f527dab8dc36735dacea0d82a 100644 (file)
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "dcp.h"
@@ -23,6 +23,7 @@
 #include "decrypted_kdm.h"
 #include "encrypted_kdm.h"
 #include "mono_picture_asset.h"
+#include "mono_picture_asset_reader.h"
 #include "reel_picture_asset.h"
 #include "reel.h"
 #include "test.h"
@@ -46,11 +47,12 @@ get_frame (dcp::DCP const & dcp)
        BOOST_CHECK (picture);
 
        shared_ptr<const dcp::MonoPictureAsset> mono_picture = dynamic_pointer_cast<const dcp::MonoPictureAsset> (picture);
-       shared_ptr<const dcp::MonoPictureFrame> j2k_frame = mono_picture->get_frame (0);
+       shared_ptr<const dcp::MonoPictureAssetReader> reader = mono_picture->start_read ();
+       shared_ptr<const dcp::MonoPictureFrame> j2k_frame = reader->get_frame (0);
        shared_ptr<dcp::OpenJPEGImage> xyz = j2k_frame->xyz_image();
 
        uint8_t* argb = new uint8_t[xyz->size().width * xyz->size().height * 4];
-       dcp::xyz_to_rgba (j2k_frame->xyz_image(), dcp::ColourConversion::srgb_to_xyz(), argb);
+       dcp::xyz_to_rgba (j2k_frame->xyz_image(), dcp::ColourConversion::srgb_to_xyz(), argb, xyz->size().width * 4);
        return make_pair (argb, xyz->size ());
 }