diff options
| -rw-r--r-- | src/decrypted_kdm.cc | 4 | ||||
| -rw-r--r-- | test/decryption_test.cc | 30 |
2 files changed, 24 insertions, 10 deletions
diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc index 03c5ea26..b2d8e618 100644 --- a/src/decrypted_kdm.cc +++ b/src/decrypted_kdm.cc @@ -264,8 +264,8 @@ DecryptedKDM::DecryptedKDM ( , _content_title_text (content_title_text) , _issue_date (issue_date) { - for (map<shared_ptr<const ReelFileAsset>, Key>::const_iterator i = keys.begin(); i != keys.end(); ++i) { - add_key (i->first->key_type(), i->first->key_id().get(), i->second, cpl_id, Standard::SMPTE); + for (auto const& i: keys) { + add_key (i.first->key_type(), i.first->key_id().get(), i.second, cpl_id, Standard::SMPTE); } } diff --git a/test/decryption_test.cc b/test/decryption_test.cc index 77f349bd..26005d12 100644 --- a/test/decryption_test.cc +++ b/test/decryption_test.cc @@ -31,29 +31,43 @@ files in the program, then also delete it here. */ -#include "dcp.h" -#include "mono_picture_frame.h" +#include "colour_conversion.h" #include "cpl.h" +#include "dcp.h" #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" +#include "mono_picture_frame.h" #include "openjpeg_image.h" +#include "picture_asset_writer.h" +#include "reel.h" +#include "reel_file_asset.h" +#include "reel_mono_picture_asset.h" +#include "reel_picture_asset.h" +#include "reel_sound_asset.h" +#include "reel_smpte_subtitle_asset.h" #include "rgb_xyz.h" -#include "colour_conversion.h" +#include "smpte_subtitle_asset.h" +#include "sound_asset.h" +#include "sound_asset_writer.h" #include "stream_operators.h" +#include "test.h" #include <boost/test/unit_test.hpp> #include <boost/scoped_array.hpp> -using std::pair; -using std::make_pair; + using std::dynamic_pointer_cast; +using std::make_pair; +using std::make_shared; +using std::map; +using std::pair; using std::shared_ptr; +using std::string; +using boost::optional; using boost::scoped_array; + pair<uint8_t*, dcp::Size> get_frame (dcp::DCP const & dcp) { |