From a6f1c4deaf0ddbf0197b286d0d5f1a107a487deb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 6 Oct 2020 23:54:32 +0200 Subject: [PATCH] Hack to allow us to make a valid boost::filesystem::path from a UTF8 constant on Windows. This might actually be a way to get around the fopen_boost hacks. --- test/file_naming_test.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc index 160fc0813..d0db2f30a 100644 --- a/test/file_naming_test.cc +++ b/test/file_naming_test.cc @@ -29,6 +29,9 @@ #include "lib/ffmpeg_content.h" #include "lib/dcp_content_type.h" #include "lib/video_content.h" +#ifdef DCPOMATIC_WINDOWS +#include +#endif #include #include @@ -111,6 +114,13 @@ BOOST_AUTO_TEST_CASE (file_naming_test2) shared_ptr film = new_test_film ("file_naming_test2"); film->set_name ("file_naming_test2"); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); + +#ifdef DCPOMATIC_WINDOWS + /* This is necessary so that the UTF8 string constant below gets converted properly */ + std::locale::global(boost::locale::generator().generate("")); + boost::filesystem::path::imbue(std::locale()); +#endif + shared_ptr r (new FFmpegContent("test/data/flät_red.png")); film->examine_and_add_content (r); shared_ptr g (new FFmpegContent("test/data/flat_green.png")); -- 2.30.2