diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/cpl_sar_test.cc | 2 | ||||
| -rw-r--r-- | test/dcp_test.cc | 6 | ||||
| -rw-r--r-- | test/decryption_test.cc | 8 | ||||
| -rw-r--r-- | test/encryption_test.cc | 4 | ||||
| -rw-r--r-- | test/frame_info_hash_test.cc | 4 | ||||
| -rw-r--r-- | test/kdm_test.cc | 4 | ||||
| -rw-r--r-- | test/recovery_test.cc | 4 | ||||
| -rw-r--r-- | test/round_trip_test.cc | 8 | ||||
| -rw-r--r-- | test/test.cc | 8 | ||||
| -rw-r--r-- | test/verify_test.cc | 6 |
10 files changed, 27 insertions, 27 deletions
diff --git a/test/cpl_sar_test.cc b/test/cpl_sar_test.cc index 0ecc87e0..39d9c483 100644 --- a/test/cpl_sar_test.cc +++ b/test/cpl_sar_test.cc @@ -33,7 +33,7 @@ #include "cpl.h" -#include "mono_picture_asset.h" +#include "mono_j2k_picture_asset.h" #include "reel_mono_picture_asset.h" #include "warnings.h" #include <libcxml/cxml.h> diff --git a/test/dcp_test.cc b/test/dcp_test.cc index 5456092c..feb7f51d 100644 --- a/test/dcp_test.cc +++ b/test/dcp_test.cc @@ -38,8 +38,8 @@ #include "dcp.h" #include "equality_options.h" #include "metadata.h" -#include "mono_picture_asset.h" -#include "picture_asset_writer.h" +#include "mono_j2k_picture_asset.h" +#include "j2k_picture_asset_writer.h" #include "reel.h" #include "reel_atmos_asset.h" #include "reel_markers_asset.h" @@ -49,7 +49,7 @@ #include "reel_stereo_picture_asset.h" #include "sound_asset.h" #include "sound_asset_writer.h" -#include "stereo_picture_asset.h" +#include "stereo_j2k_picture_asset.h" #include "test.h" #include <asdcp/KM_util.h> #include <sndfile.h> diff --git a/test/decryption_test.cc b/test/decryption_test.cc index 8f3dbff7..3d858028 100644 --- a/test/decryption_test.cc +++ b/test/decryption_test.cc @@ -36,11 +36,11 @@ #include "dcp.h" #include "decrypted_kdm.h" #include "encrypted_kdm.h" -#include "mono_picture_asset.h" -#include "mono_picture_asset_reader.h" -#include "mono_picture_frame.h" +#include "mono_j2k_picture_asset.h" +#include "mono_j2k_picture_asset_reader.h" +#include "mono_j2k_picture_frame.h" #include "openjpeg_image.h" -#include "picture_asset_writer.h" +#include "j2k_picture_asset_writer.h" #include "reel.h" #include "reel_file_asset.h" #include "reel_mono_picture_asset.h" diff --git a/test/encryption_test.cc b/test/encryption_test.cc index 358a3fd9..6e145056 100644 --- a/test/encryption_test.cc +++ b/test/encryption_test.cc @@ -37,8 +37,8 @@ #include "certificate_chain.h" #include "cpl.h" #include "filesystem.h" -#include "mono_picture_asset.h" -#include "picture_asset_writer.h" +#include "mono_j2k_picture_asset.h" +#include "j2k_picture_asset_writer.h" #include "sound_asset_writer.h" #include "sound_asset.h" #include "reel.h" diff --git a/test/frame_info_hash_test.cc b/test/frame_info_hash_test.cc index c8bdb3e8..94336867 100644 --- a/test/frame_info_hash_test.cc +++ b/test/frame_info_hash_test.cc @@ -33,8 +33,8 @@ #include "j2k_transcode.h" -#include "mono_picture_asset.h" -#include "mono_picture_asset_writer.h" +#include "mono_j2k_picture_asset.h" +#include "mono_j2k_picture_asset_writer.h" #include "openjpeg_image.h" #include <boost/random.hpp> #include <boost/test/unit_test.hpp> diff --git a/test/kdm_test.cc b/test/kdm_test.cc index 6f06b4c9..5eae90c3 100644 --- a/test/kdm_test.cc +++ b/test/kdm_test.cc @@ -36,8 +36,8 @@ #include "cpl.h" #include "decrypted_kdm.h" #include "encrypted_kdm.h" -#include "mono_picture_asset.h" -#include "picture_asset_writer.h" +#include "mono_j2k_picture_asset.h" +#include "j2k_picture_asset_writer.h" #include "reel.h" #include "reel_mono_picture_asset.h" #include "reel_sound_asset.h" diff --git a/test/recovery_test.cc b/test/recovery_test.cc index eaf34f81..b968c86f 100644 --- a/test/recovery_test.cc +++ b/test/recovery_test.cc @@ -32,8 +32,8 @@ */ -#include "mono_picture_asset_writer.h" -#include "mono_picture_asset.h" +#include "mono_j2k_picture_asset_writer.h" +#include "mono_j2k_picture_asset.h" #include "test.h" #include <asdcp/KM_util.h> #include <boost/filesystem.hpp> diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc index 028accbe..02b9f78e 100644 --- a/test/round_trip_test.cc +++ b/test/round_trip_test.cc @@ -35,15 +35,15 @@ #include "decrypted_kdm.h" #include "encrypted_kdm.h" #include "certificate_chain.h" -#include "mono_picture_asset.h" +#include "mono_j2k_picture_asset.h" #include "sound_asset.h" #include "reel.h" #include "test.h" #include "cpl.h" -#include "mono_picture_frame.h" +#include "mono_j2k_picture_frame.h" #include "certificate_chain.h" -#include "mono_picture_asset_writer.h" -#include "mono_picture_asset_reader.h" +#include "mono_j2k_picture_asset_writer.h" +#include "mono_j2k_picture_asset_reader.h" #include "reel_picture_asset.h" #include "reel_mono_picture_asset.h" #include "openjpeg_image.h" diff --git a/test/test.cc b/test/test.cc index bf0e9b03..efe02209 100644 --- a/test/test.cc +++ b/test/test.cc @@ -39,11 +39,11 @@ #include "interop_subtitle_asset.h" #include "file.h" #include "j2k_transcode.h" -#include "mono_picture_asset.h" -#include "mono_picture_asset.h" +#include "mono_j2k_picture_asset.h" +#include "mono_j2k_picture_asset.h" #include "openjpeg_image.h" -#include "picture_asset_writer.h" -#include "picture_asset_writer.h" +#include "j2k_picture_asset_writer.h" +#include "j2k_picture_asset_writer.h" #include "reel.h" #include "reel_asset.h" #include "reel_interop_closed_caption_asset.h" diff --git a/test/verify_test.cc b/test/verify_test.cc index 30e2e5e7..d9e88ec1 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -38,8 +38,8 @@ #include "file.h" #include "interop_subtitle_asset.h" #include "j2k_transcode.h" -#include "mono_picture_asset.h" -#include "mono_picture_asset_writer.h" +#include "mono_j2k_picture_asset.h" +#include "mono_j2k_picture_asset_writer.h" #include "openjpeg_image.h" #include "raw_convert.h" #include "reel.h" @@ -52,7 +52,7 @@ #include "reel_smpte_closed_caption_asset.h" #include "reel_smpte_subtitle_asset.h" #include "smpte_subtitle_asset.h" -#include "stereo_picture_asset.h" +#include "stereo_j2k_picture_asset.h" #include "stream_operators.h" #include "test.h" #include "util.h" |