From b03f2277a205ff7e7cdaa12c6e52322ea474a7af Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 30 Dec 2024 15:43:14 +0100 Subject: Bump libdcp for raw_convert changes. raw_convert is gone, so here we use fmt::{to_string,format} instead. Other raw_converts now use fast_float. --- test/j2k_video_bit_rate_test.cc | 4 ++-- test/socket_test.cc | 8 ++++---- test/subtitle_reel_number_test.cc | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'test') diff --git a/test/j2k_video_bit_rate_test.cc b/test/j2k_video_bit_rate_test.cc index b3eccd98a..5ab1880bf 100644 --- a/test/j2k_video_bit_rate_test.cc +++ b/test/j2k_video_bit_rate_test.cc @@ -30,8 +30,8 @@ #include "lib/film.h" #include "lib/image_content.h" #include "lib/video_content.h" -#include #include +#include using std::make_shared; @@ -45,7 +45,7 @@ check (int target_bits_per_second) int const duration = 10; - string const name = "bandwidth_test_" + dcp::raw_convert (target_bits_per_second); + string const name = "bandwidth_test_" + fmt::to_string(target_bits_per_second); auto content = make_shared(TestPaths::private_data() / "prophet_frame.tiff"); auto film = new_test_film(name, { content }, &cl); film->set_video_bit_rate(VideoEncoding::JPEG2000, target_bits_per_second); diff --git a/test/socket_test.cc b/test/socket_test.cc index bcdbcd724..395e5f720 100644 --- a/test/socket_test.cc +++ b/test/socket_test.cc @@ -21,7 +21,7 @@ #include "lib/dcpomatic_socket.h" #include "lib/server.h" -#include +#include #include #include #include @@ -127,7 +127,7 @@ BOOST_AUTO_TEST_CASE (socket_basic_test) boost::asio::io_service io_service; tcp::resolver resolver (io_service); - tcp::resolver::query query ("127.0.0.1", dcp::raw_convert(TEST_SERVER_PORT)); + tcp::resolver::query query("127.0.0.1", fmt::to_string(TEST_SERVER_PORT)); tcp::resolver::iterator endpoint_iterator = resolver.resolve (query); auto socket = make_shared(); @@ -149,7 +149,7 @@ BOOST_AUTO_TEST_CASE (socket_digest_test1) boost::asio::io_service io_service; tcp::resolver resolver (io_service); - tcp::resolver::query query ("127.0.0.1", dcp::raw_convert(TEST_SERVER_PORT)); + tcp::resolver::query query("127.0.0.1", fmt::to_string(TEST_SERVER_PORT)); tcp::resolver::iterator endpoint_iterator = resolver.resolve (query); shared_ptr socket(new Socket); @@ -178,7 +178,7 @@ BOOST_AUTO_TEST_CASE (socket_digest_test2) boost::asio::io_service io_service; tcp::resolver resolver (io_service); - tcp::resolver::query query ("127.0.0.1", dcp::raw_convert(TEST_SERVER_PORT)); + tcp::resolver::query query("127.0.0.1", fmt::to_string(TEST_SERVER_PORT)); tcp::resolver::iterator endpoint_iterator = resolver.resolve (query); shared_ptr socket(new Socket); diff --git a/test/subtitle_reel_number_test.cc b/test/subtitle_reel_number_test.cc index a74cc097d..caa3cb2fe 100644 --- a/test/subtitle_reel_number_test.cc +++ b/test/subtitle_reel_number_test.cc @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include @@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_number_test) if (i->main_subtitle()) { auto ass = dynamic_pointer_cast(i->main_subtitle()->asset()); BOOST_REQUIRE (ass); - BOOST_CHECK_EQUAL (ass->reel_number(), dcp::raw_convert(n)); + BOOST_CHECK_EQUAL (ass->reel_number(), fmt::to_string(n)); ++n; } } -- cgit v1.2.3