Fix erroneous reports of unresolved assets when checking OV/VF pairs.

[libdcp.git] / src / mono_picture_frame.cc

diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc
index f53dfa7bdcfa34e95e31140c8dc1338d5cb72260..9af34c486fda5ffe0d41dd0adef825ebde2c68a6 100644 (file)
--- a/src/mono_picture_frame.cc
+++ b/src/mono_picture_frame.cc
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/mono_picture_frame.cc
@@ -26,10 +40,11 @@
 #include "util.h"
 #include "rgb_xyz.h"
 #include "colour_conversion.h"
-#include "KM_fileio.h"
-#include "AS_DCP.h"
 #include "compose.hpp"
 #include "j2k.h"
+#include "crypto_context.h"
+#include <asdcp/KM_fileio.h>
+#include <asdcp/AS_DCP.h>
 
 using std::string;
 using boost::shared_ptr;
@@ -48,7 +63,11 @@ MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path)
                boost::throw_exception (FileError ("could not open JPEG2000 file", path, errno));
        }
 
-       fread (j2k_data(), 1, size, f);
+       size_t n = fread (j2k_data(), 1, size, f);
+       if (n != size) {
+               boost::throw_exception (FileError ("could not read from JPEG2000 file", path, errno));
+       }
+
        fclose (f);
 
        _buffer->Size (size);
@@ -59,13 +78,15 @@ MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path)
  *  @param n Frame within the asset, not taking EntryPoint into account.
  *  @param c Context for decryption, or 0.
  */
-MonoPictureFrame::MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, ASDCP::AESDecContext* c)
+MonoPictureFrame::MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, shared_ptr<DecryptionContext> c)
 {
        /* XXX: unfortunate guesswork on this buffer size */
        _buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte);
 
-       if (ASDCP_FAILURE (reader->ReadFrame (n, *_buffer, c))) {
-               boost::throw_exception (DCPReadError (String::compose ("could not read video frame %1", n)));
+       ASDCP::Result_t const r = reader->ReadFrame (n, *_buffer, c->context(), c->hmac());
+
+       if (ASDCP_FAILURE (r)) {
+               boost::throw_exception (DCPReadError (String::compose ("could not read video frame %1 (%2)", n, static_cast<int>(r))));
        }
 }