diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-12-30 15:43:14 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-01-05 12:58:13 +0100 |
| commit | b03f2277a205ff7e7cdaa12c6e52322ea474a7af (patch) | |
| tree | d6067668105b2f0c6d0651bd1b8bd4186e0b8893 /test | |
| parent | e46ff5f1cf168fb73ea930f3e8469165e5f6644e (diff) | |
Bump libdcp for raw_convert changes.
raw_convert<string> is gone, so here we use fmt::{to_string,format} instead.
Other raw_converts now use fast_float.
Diffstat (limited to 'test')
| -rw-r--r-- | test/j2k_video_bit_rate_test.cc | 4 | ||||
| -rw-r--r-- | test/socket_test.cc | 8 | ||||
| -rw-r--r-- | test/subtitle_reel_number_test.cc | 4 |
3 files changed, 8 insertions, 8 deletions
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 <dcp/raw_convert.h> #include <boost/test/unit_test.hpp> +#include <fmt/format.h> 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<string> (target_bits_per_second); + string const name = "bandwidth_test_" + fmt::to_string(target_bits_per_second); auto content = make_shared<ImageContent>(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 <dcp/raw_convert.h> +#include <fmt/format.h> #include <boost/test/unit_test.hpp> #include <boost/thread.hpp> #include <cstring> @@ -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<string>(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<Socket>(); @@ -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<string>(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> 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<string>(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> 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 <dcp/reel.h> #include <dcp/interop_text_asset.h> #include <dcp/reel_text_asset.h> -#include <dcp/raw_convert.h> +#include <fmt/format.h> #include <boost/test/unit_test.hpp> @@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_number_test) if (i->main_subtitle()) { auto ass = dynamic_pointer_cast<dcp::InteropTextAsset>(i->main_subtitle()->asset()); BOOST_REQUIRE (ass); - BOOST_CHECK_EQUAL (ass->reel_number(), dcp::raw_convert<string>(n)); + BOOST_CHECK_EQUAL (ass->reel_number(), fmt::to_string(n)); ++n; } } |