From 9401afc97abeaf4b63c867393e5047e385002f8a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 8 Feb 2026 21:10:49 +0100 Subject: Fix a few unwrapped boost::filesystem calls that had crept in. --- src/lib/cross_linux.cc | 2 +- src/lib/film.cc | 2 +- src/lib/map_cli.cc | 2 +- src/lib/reel_writer.cc | 4 ++-- src/lib/writer.cc | 4 ++-- src/wx/wx_util.cc | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc index d9ab73706..96fa3b161 100644 --- a/src/lib/cross_linux.cc +++ b/src/lib/cross_linux.cc @@ -86,7 +86,7 @@ boost::filesystem::path resources_path () { auto installed = directory_containing_executable().parent_path() / "share" / "dcpomatic2"; - if (boost::filesystem::exists(installed)) { + if (dcp::filesystem::exists(installed)) { return installed; } diff --git a/src/lib/film.cc b/src/lib/film.cc index f65e34368..075666543 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -2572,7 +2572,7 @@ Film::read_remembered_assets() const { auto const filename = dcp::filesystem::fix_long_path(file(assets_file)); - if (!boost::filesystem::exists(filename)) { + if (!dcp::filesystem::exists(filename)) { return {}; } diff --git a/src/lib/map_cli.cc b/src/lib/map_cli.cc index 43023a440..64ea9dbca 100644 --- a/src/lib/map_cli.cc +++ b/src/lib/map_cli.cc @@ -180,7 +180,7 @@ map_cli(int argc, char* argv[], std::function out) /* Find all the CPLs */ vector> cpls; for (auto filename_or_id: cpl_filenames_or_ids) { - if (boost::filesystem::exists(filename_or_id)) { + if (dcp::filesystem::exists(filename_or_id)) { try { auto cpl = make_shared(filename_or_id); cpl->resolve_refs(assets); diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index dacaf3a25..b85b53305 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -755,7 +755,7 @@ try int64_t total_size = 0; for (auto asset: assets) { - total_size += asset->file() ? boost::filesystem::file_size(*asset->file()) : 0; + total_size += asset->file() ? dcp::filesystem::file_size(*asset->file()) : 0; } int64_t total_done = 0; @@ -763,7 +763,7 @@ try asset->hash([&total_done, total_size, set_progress](int64_t done, int64_t) { set_progress(total_done + done, total_size); }); - total_done += asset->file() ? boost::filesystem::file_size(*asset->file()) : 0; + total_done += asset->file() ? dcp::filesystem::file_size(*asset->file()) : 0; } } catch (boost::thread_interrupted) { diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 20bf2cab8..be14e6ef0 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -941,7 +941,7 @@ try if (file && !file->hash()) { auto filename = file->asset_ref().asset()->file(); DCPOMATIC_ASSERT(filename); - total_size += boost::filesystem::file_size(*filename); + total_size += dcp::filesystem::file_size(*filename); } } @@ -952,7 +952,7 @@ try file->asset_ref().asset()->hash([&total_done, total_size, set_progress](int64_t done, int64_t) { set_progress(total_done + done, total_size); }); - total_done += boost::filesystem::file_size(*file->asset_ref().asset()->file()); + total_done += dcp::filesystem::file_size(*file->asset_ref().asset()->file()); file->set_hash(file->asset_ref().asset()->hash()); } } diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index 7d0329070..6abbaa7bb 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -636,7 +636,7 @@ bitmap_path (string name) base = resources_path(); } - if (!boost::filesystem::exists(base / name)) { + if (!dcp::filesystem::exists(base / name)) { base = path / boost::filesystem::path("osx/preferences"); } #else -- cgit v1.2.3