Hide dump_notes() again.
[libdcp.git] / test / decryption_test.cc
index 65f1fe878df95b2ef0ecbad4202207d8b229ea2d..77f349bd1940c30937ef9df8e3b0c79fd13fece1 100644 (file)
 #include "openjpeg_image.h"
 #include "rgb_xyz.h"
 #include "colour_conversion.h"
+#include "stream_operators.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/scoped_array.hpp>
 
 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<uint8_t*, dcp::Size>
@@ -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 (