diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-01-11 23:28:22 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-01-12 02:06:50 +0100 |
| commit | bf046ff9f983efb4419f781f00fce2e16122010f (patch) | |
| tree | 6a42d2a5cc4a1f4e6e90061b8e7b1c293ec83dd9 | |
| parent | ff7eb5af765936b832c8519e9340498ee9fb25f4 (diff) | |
Fix fl indication in ISDCF name.
Maybe I missed it, or maybe it changed, but apparently 3.5fl is supposed
to be written as 35fl in the name.
| -rw-r--r-- | src/lib/film.cc | 5 | ||||
| -rw-r--r-- | test/isdcf_name_test.cc | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 4c3fd61a5..7b6b46ab9 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -964,10 +964,7 @@ Film::isdcf_name (bool if_created_now) const } if (_luminance) { - auto fl = _luminance->value_in_foot_lamberts(); - char buffer[64]; - snprintf (buffer, sizeof(buffer), "%.1f", fl); - isdcf_name += String::compose("-%1fl", buffer); + isdcf_name += fmt::format("-{}fl", std::round(_luminance->value_in_foot_lamberts() * 10)); } if (video_frame_rate() != 24) { diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc index 40626621f..bd2289138 100644 --- a/test/isdcf_name_test.cc +++ b/test/isdcf_name_test.cc @@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) film->set_chain (string("MyChain")); film->set_luminance (dcp::Luminance(4.5, dcp::Luminance::Unit::FOOT_LAMBERT)); film->set_video_frame_rate (48); - BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2-Temp-Pre-RedBand-MyChain-2D-4.5fl-48_F-133_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV"); + BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2-Temp-Pre-RedBand-MyChain-2D-45fl-48_F-133_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV"); /* Test a name which is already in camelCase */ |