std::shared_ptr

[libdcp.git] / src / verify.cc

diff --git a/src/verify.cc b/src/verify.cc
index aad6952f6c9b06575a7d8dc9181a4403a8e42ff5..e31fa682df73eaca67a7acaeedfc31688bce40ce 100644 (file)
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -78,10 +78,10 @@ using std::string;
 using std::cout;
 using std::map;
 using std::max;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using boost::function;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 
 using namespace dcp;
 using namespace xercesc;
@@ -405,13 +405,13 @@ enum VerifyPictureAssetResult
 int
 biggest_frame_size (shared_ptr<const MonoPictureFrame> frame)
 {
-       return frame->j2k_size ();
+       return frame->size ();
 }
 
 int
 biggest_frame_size (shared_ptr<const StereoPictureFrame> frame)
 {
-       return max(frame->left_j2k_size(), frame->right_j2k_size());
+       return max(frame->left()->size(), frame->right()->size());
 }
 
 
@@ -598,7 +598,7 @@ dcp::verify (
                        /* Check that the CPL's hash corresponds to the PKL */
                        BOOST_FOREACH (shared_ptr<PKL> i, dcp->pkls()) {
                                optional<string> h = i->hash(cpl->id());
-                               if (h && make_digest(Data(*cpl->file())) != *h) {
+                               if (h && make_digest(ArrayData(*cpl->file())) != *h) {
                                        notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::CPL_HASH_INCORRECT));
                                }
                        }