From f6d466eee4f1381a65da4b5f6d60924e6a81df4e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 8 Nov 2023 23:43:24 +0100 Subject: Fix includes. sed -i "s/#include \"stereo_picture_asset_writer.h\"/#include \"stereo_j2k_picture_asset_writer.h\""/g src/*.{cc,h} sed -i "s/#include \"mono_picture_asset_writer.h\"/#include \"mono_j2k_picture_asset_writer.h\""/g src/*.{cc,h} examples/*.cc sed -i "s/#include \"stereo_picture_asset_reader.h\"/#include \"stereo_j2k_picture_asset_reader.h\""/g src/*.{cc,h} sed -i "s/#include \"mono_picture_asset_reader.h\"/#include \"mono_j2k_picture_asset_reader.h\""/g src/*.{cc,h} test/*.cc examples/*.cc sed -i "s/#include \"stereo_picture_asset.h\"/#include \"stereo_j2k_picture_asset.h\""/g src/*.{cc,h} test/*.cc examples/*.cc sed -i "s/#include \"mono_picture_asset.h\"/#include \"mono_j2k_picture_asset.h\""/g src/*.{cc,h} examples/*.cc sed -i "s/#include \"picture_asset_writer.h\"/#include \"j2k_picture_asset_writer.h\""/g src/*.{cc,h} test/*.cc sed -i "s/#include \"mono_picture_asset_writer.h\"/#include \"mono_j2k_picture_asset_writer.h\""/g src/*.{cc,h} test/*.cc tools/*.cc sed -i "s/#include \"picture_asset.h\"/#include \"j2k_picture_asset.h\""/g src/*.{cc,h} tools/*.cc sed -i "s/#include \"mono_picture_asset.h\"/#include \"mono_j2k_picture_asset.h\""/g src/*.{cc,h} test/*.cc tools/*.cc sed -i "s/#include \"mono_picture_frame.h\"/#include \"mono_j2k_picture_frame.h\""/g src/*.{cc,h} test/*.cc examples/*.cc sed -i "s/#include \"stereo_picture_frame.h\"/#include \"stereo_j2k_picture_frame.h\""/g src/*.{cc,h} sed -i "s/#include \"picture_asset_writer_common.cc\"/#include \"j2k_picture_asset_writer_common.cc\""/g src/*.{cc,h} --- tools/dcpdecryptmxf.cc | 4 ++-- tools/dcpdumpimage.cc | 2 +- tools/dcpinfo.cc | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tools') diff --git a/tools/dcpdecryptmxf.cc b/tools/dcpdecryptmxf.cc index 451a4d34..5285756a 100644 --- a/tools/dcpdecryptmxf.cc +++ b/tools/dcpdecryptmxf.cc @@ -41,8 +41,8 @@ #include "encrypted_kdm.h" #include "exceptions.h" #include "key.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 "sound_asset.h" #include "sound_asset_writer.h" #include "util.h" diff --git a/tools/dcpdumpimage.cc b/tools/dcpdumpimage.cc index 728e42c7..c57857b2 100644 --- a/tools/dcpdumpimage.cc +++ b/tools/dcpdumpimage.cc @@ -35,7 +35,7 @@ #include "colour_conversion.h" #include "cpl.h" #include "dcp.h" -#include "mono_picture_asset.h" +#include "mono_j2k_picture_asset.h" #include "openjpeg_image.h" #include "reel_picture_asset.h" #include "raw_convert.h" diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc index e812afe4..7e65d0d6 100644 --- a/tools/dcpinfo.cc +++ b/tools/dcpinfo.cc @@ -41,8 +41,8 @@ #include "exceptions.h" #include "filesystem.h" #include "interop_subtitle_asset.h" -#include "mono_picture_asset.h" -#include "picture_asset.h" +#include "mono_j2k_picture_asset.h" +#include "j2k_picture_asset.h" #include "reel.h" #include "reel_picture_asset.h" #include "reel_sound_asset.h" -- cgit v1.2.3