X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdecryption_test.cc;h=77f349bd1940c30937ef9df8e3b0c79fd13fece1;hb=d4f883f7e88b93d1ec2d451036f2b85434baff13;hp=65f1fe878df95b2ef0ecbad4202207d8b229ea2d;hpb=ff7e50bfae825ea01d010ba5f8fde44668ddeb9e;p=libdcp.git diff --git a/test/decryption_test.cc b/test/decryption_test.cc index 65f1fe87..77f349bd 100644 --- a/test/decryption_test.cc +++ b/test/decryption_test.cc @@ -44,13 +44,14 @@ #include "openjpeg_image.h" #include "rgb_xyz.h" #include "colour_conversion.h" +#include "stream_operators.h" #include #include using std::pair; using std::make_pair; -using boost::dynamic_pointer_cast; -using boost::shared_ptr; +using std::dynamic_pointer_cast; +using std::shared_ptr; using boost::scoped_array; pair @@ -77,13 +78,13 @@ BOOST_AUTO_TEST_CASE (decryption_test) plaintext_path /= "TONEPLATES-SMPTE-PLAINTEXT_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV"; dcp::DCP plaintext (plaintext_path.string ()); plaintext.read (); - BOOST_CHECK_EQUAL (plaintext.encrypted (), false); + BOOST_CHECK_EQUAL (plaintext.any_encrypted(), false); boost::filesystem::path encrypted_path = private_test; encrypted_path /= "TONEPLATES-SMPTE-ENCRYPTED_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV"; dcp::DCP encrypted (encrypted_path.string ()); encrypted.read (); - BOOST_CHECK_EQUAL (encrypted.encrypted (), true); + BOOST_CHECK_EQUAL (encrypted.any_encrypted(), true); dcp::DecryptedKDM kdm ( dcp::EncryptedKDM (