From 809bcfd85fad2ef7d4131c054be4cccd5bcc9d05 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 11 Oct 2021 19:55:06 +0200 Subject: [PATCH] Replace some raw arrays with std::vectors. --- src/lib/cross_windows.cc | 7 +++---- src/lib/ffmpeg_encoder.cc | 7 +++---- src/lib/file_log.cc | 11 +++++------ src/lib/image_examiner.cc | 8 +++----- src/lib/update_checker.cc | 7 +++---- src/lib/update_checker.h | 2 +- src/tools/dcpomatic.cc | 5 ++--- src/tools/dcpomatic_player.cc | 5 ++--- src/wx/gl_video_view.cc | 14 ++++++-------- test/create_cli_test.cc | 6 ++---- test/dcp_playback_test.cc | 5 ++--- test/ffmpeg_audio_only_test.cc | 29 ++++++++++------------------- test/socket_test.cc | 11 +++++------ test/test.cc | 28 +++++++++++----------------- 14 files changed, 58 insertions(+), 87 deletions(-) diff --git a/src/lib/cross_windows.cc b/src/lib/cross_windows.cc index a7e7bdd55..f76380836 100644 --- a/src/lib/cross_windows.cc +++ b/src/lib/cross_windows.cc @@ -353,10 +353,9 @@ static string wchar_to_utf8 (wchar_t const * s) { int const length = (wcslen(s) + 1) * 2; - char* utf8 = new char[length]; - WideCharToMultiByte (CP_UTF8, 0, s, -1, utf8, length, 0, 0); - string u (utf8); - delete[] utf8; + std::vector utf8(length); + WideCharToMultiByte (CP_UTF8, 0, s, -1, utf8.data(), length, 0, 0); + string u (utf8.data()); return u; } diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index 8f36bbda1..d4f0b4b47 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -161,7 +161,7 @@ FFmpegEncoder::go () auto const video_frame = DCPTime::from_frames (1, _film->video_frame_rate ()); int const audio_frames = video_frame.frames_round(_film->audio_frame_rate()); - float* interleaved = new float[_output_audio_channels * audio_frames]; + std::vector interleaved(_output_audio_channels * audio_frames); auto deinterleaved = make_shared(_output_audio_channels, audio_frames); int const gets_per_frame = _film->three_d() ? 2 : 1; for (DCPTime i; i < _film->length(); i += video_frame) { @@ -204,9 +204,9 @@ FFmpegEncoder::go () waker.nudge (); - _butler->get_audio (Butler::Behaviour::BLOCKING, interleaved, audio_frames); + _butler->get_audio (Butler::Behaviour::BLOCKING, interleaved.data(), audio_frames); /* XXX: inefficient; butler interleaves and we deinterleave again */ - float* p = interleaved; + float* p = interleaved.data(); for (int j = 0; j < audio_frames; ++j) { for (int k = 0; k < _output_audio_channels; ++k) { deinterleaved->data(k)[j] = *p++; @@ -214,7 +214,6 @@ FFmpegEncoder::go () } encoder->audio (deinterleaved); } - delete[] interleaved; for (auto i: file_encoders) { i.flush (); diff --git a/src/lib/file_log.cc b/src/lib/file_log.cc index 4d6a0e6ea..a9522bad5 100644 --- a/src/lib/file_log.cc +++ b/src/lib/file_log.cc @@ -87,23 +87,22 @@ FileLog::head_and_tail (int amount) const string out; - auto buffer = new char[max(head_amount, tail_amount) + 1]; + std::vector buffer(max(head_amount, tail_amount) + 1); - int N = fread (buffer, 1, head_amount, f); + int N = fread (buffer.data(), 1, head_amount, f); buffer[N] = '\0'; - out += string (buffer); + out += string (buffer.data()); if (tail_amount > 0) { out += "\n .\n .\n .\n"; fseek (f, - tail_amount - 1, SEEK_END); - N = fread (buffer, 1, tail_amount, f); + N = fread (buffer.data(), 1, tail_amount, f); buffer[N] = '\0'; - out += string (buffer) + "\n"; + out += string (buffer.data()) + "\n"; } - delete[] buffer; fclose (f); return out; diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc index 2235c2e69..5a1672204 100644 --- a/src/lib/image_examiner.cc +++ b/src/lib/image_examiner.cc @@ -55,16 +55,14 @@ ImageExaminer::ImageExaminer (shared_ptr film, shared_ptr buffer(size); + checked_fread (buffer.data(), size, f, path); fclose (f); try { - _video_size = dcp::decompress_j2k (buffer, size, 0)->size (); + _video_size = dcp::decompress_j2k(buffer.data(), size, 0)->size(); } catch (dcp::ReadError& e) { - delete[] buffer; throw DecodeError (String::compose (_("Could not decode JPEG2000 file %1 (%2)"), path, e.what ())); } - delete[] buffer; } else { FFmpegImageProxy proxy(content->path(0)); _video_size = proxy.image(Image::Alignment::COMPACT).image->size(); diff --git a/src/lib/update_checker.cc b/src/lib/update_checker.cc index 3bc02b50a..2c2e23be1 100644 --- a/src/lib/update_checker.cc +++ b/src/lib/update_checker.cc @@ -57,7 +57,7 @@ write_callback_wrapper (void* data, size_t size, size_t nmemb, void* user) * do the work. */ UpdateChecker::UpdateChecker () - : _buffer (new char[BUFFER_SIZE]) + : _buffer (BUFFER_SIZE) , _state (State::NOT_RUN) { _curl = curl_easy_init (); @@ -97,7 +97,6 @@ UpdateChecker::~UpdateChecker () } catch (...) {} curl_easy_cleanup (_curl); - delete[] _buffer; } @@ -142,7 +141,7 @@ UpdateChecker::thread () /* Parse the reply */ _buffer[_offset] = '\0'; - string s (_buffer); + string s (_buffer.data()); cxml::Document doc ("Update"); doc.read_string (s); @@ -181,7 +180,7 @@ size_t UpdateChecker::write_callback (void* data, size_t size, size_t nmemb) { size_t const t = min (size * nmemb, size_t (BUFFER_SIZE - _offset - 1)); - memcpy (_buffer + _offset, data, t); + memcpy (_buffer.data() + _offset, data, t); _offset += t; return t; } diff --git a/src/lib/update_checker.h b/src/lib/update_checker.h index aa5f620e6..53ef4457b 100644 --- a/src/lib/update_checker.h +++ b/src/lib/update_checker.h @@ -89,7 +89,7 @@ private: void set_state (State); void thread (); - char* _buffer; + std::vector _buffer; int _offset = 0; CURL* _curl = nullptr; diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 8455163bb..e9302c6a0 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -389,7 +389,7 @@ public: #else int accelerators = 6; #endif - auto accel = new wxAcceleratorEntry[accelerators]; + std::vector accel(accelerators); /* [Shortcut] Ctrl+A:Add file(s) to the film */ accel[0].Set (wxACCEL_CTRL, static_cast('A'), ID_add_file); /* [Shortcut] Delete:Remove selected content from film */ @@ -411,9 +411,8 @@ public: Bind (wxEVT_MENU, boost::bind (&DOMFrame::timeline_pressed, this), ID_timeline); Bind (wxEVT_MENU, boost::bind (&DOMFrame::back_frame, this), ID_back_frame); Bind (wxEVT_MENU, boost::bind (&DOMFrame::forward_frame, this), ID_forward_frame); - wxAcceleratorTable accel_table (accelerators, accel); + wxAcceleratorTable accel_table (accelerators, accel.data()); SetAcceleratorTable (accel_table); - delete[] accel; } void remove_accelerators () diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index d1d4720ed..7603b9842 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -224,7 +224,7 @@ public: _stress.setup (this, _controls); - wxAcceleratorEntry* accel = new wxAcceleratorEntry[accelerators]; + std::vector accel(accelerators); accel[0].Set(wxACCEL_NORMAL, WXK_SPACE, ID_start_stop); accel[1].Set(wxACCEL_NORMAL, WXK_LEFT, ID_go_back_frame); accel[2].Set(wxACCEL_NORMAL, WXK_RIGHT, ID_go_forward_frame); @@ -239,9 +239,8 @@ public: #ifdef __WXOSX__ accel[11].Set(wxACCEL_CTRL, static_cast('W'), ID_file_close); #endif - wxAcceleratorTable accel_table (accelerators, accel); + wxAcceleratorTable accel_table (accelerators, accel.data()); SetAcceleratorTable (accel_table); - delete[] accel; Bind (wxEVT_MENU, boost::bind(&DOMFrame::start_stop_pressed, this), ID_start_stop); Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_back_frame, this), ID_go_back_frame); diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc index be13cea43..1073cb944 100644 --- a/src/wx/gl_video_view.cc +++ b/src/wx/gl_video_view.cc @@ -408,10 +408,9 @@ GLVideoView::setup_shaders () glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &log_length); string log; if (log_length > 0) { - char* log_char = new char[log_length]; - glGetShaderInfoLog(shader, log_length, nullptr, log_char); - log = string(log_char); - delete[] log_char; + std::vector log_char(log_length); + glGetShaderInfoLog(shader, log_length, nullptr, log_char.data()); + log = string(log_char.data()); } glDeleteShader(shader); throw GLError(String::compose("Could not compile shader (%1)", log).c_str(), -1); @@ -437,10 +436,9 @@ GLVideoView::setup_shaders () glGetProgramiv(program, GL_INFO_LOG_LENGTH, &log_length); string log; if (log_length > 0) { - char* log_char = new char[log_length]; - glGetProgramInfoLog(program, log_length, nullptr, log_char); - log = string(log_char); - delete[] log_char; + std::vector log_char(log_length); + glGetProgramInfoLog(program, log_length, nullptr, log_char.data()); + log = string(log_char.data()); } glDeleteProgram (program); throw GLError(String::compose("Could not link shader (%1)", log).c_str(), -1); diff --git a/test/create_cli_test.cc b/test/create_cli_test.cc index 523fd75e6..97ac25374 100644 --- a/test/create_cli_test.cc +++ b/test/create_cli_test.cc @@ -37,21 +37,19 @@ run (string cmd) boost::escaped_list_separator els ("", " ", "\"\'"); boost::tokenizer > tok (cmd, els); - char** argv = new char*[256]; + std::vector argv(256); int argc = 0; for (boost::tokenizer >::iterator i = tok.begin(); i != tok.end(); ++i) { argv[argc++] = strdup (i->c_str()); } - CreateCLI cc (argc, argv); + CreateCLI cc (argc, argv.data()); for (int i = 0; i < argc; ++i) { free (argv[i]); } - delete[] argv; - return cc; } diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc index 74d5edd3f..4cdb9f897 100644 --- a/test/dcp_playback_test.cc +++ b/test/dcp_playback_test.cc @@ -55,15 +55,14 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test) false ); - auto audio_buffer = new float[2000 * 6]; + std::vector audio_buffer(2000 * 6); while (true) { auto p = butler->get_video (Butler::Behaviour::BLOCKING, 0); if (!p.first) { break; } /* assuming DCP is 24fps/48kHz */ - butler->get_audio (Butler::Behaviour::BLOCKING, audio_buffer, 2000); + butler->get_audio (Butler::Behaviour::BLOCKING, audio_buffer.data(), 2000); p.first->image(boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true); } - delete[] audio_buffer; } diff --git a/test/ffmpeg_audio_only_test.cc b/test/ffmpeg_audio_only_test.cc index 40c909b39..ea9a9c4e5 100644 --- a/test/ffmpeg_audio_only_test.cc +++ b/test/ffmpeg_audio_only_test.cc @@ -48,17 +48,16 @@ using namespace boost::placeholders; static SNDFILE* ref = nullptr; -static int ref_buffer_size = 0; -static float* ref_buffer = nullptr; +static std::vector ref_buffer; static void audio (std::shared_ptr audio, int channels) { /* Check that we have a big enough buffer */ - BOOST_CHECK (audio->frames() * audio->channels() < ref_buffer_size); + BOOST_CHECK (audio->frames() * audio->channels() < static_cast(ref_buffer.size())); - int const N = sf_readf_float (ref, ref_buffer, audio->frames()); + int const N = sf_readf_float (ref, ref_buffer.data(), audio->frames()); for (int i = 0; i < N; ++i) { switch (channels) { case 1: @@ -98,8 +97,7 @@ test (boost::filesystem::path file) ref = sf_open (file.string().c_str(), SFM_READ, &info); /* We don't want to test anything that requires resampling */ BOOST_REQUIRE_EQUAL (info.samplerate, 48000); - ref_buffer_size = info.samplerate * info.channels; - ref_buffer = new float[ref_buffer_size]; + ref_buffer.resize(info.samplerate * info.channels); auto player = make_shared(film, Image::Alignment::COMPACT); @@ -107,7 +105,6 @@ test (boost::filesystem::path file) while (!player->pass ()) {} sf_close (ref); - delete[] ref_buffer; return film; } @@ -126,21 +123,19 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test1) /* We don't want to test anything that requires resampling */ BOOST_REQUIRE_EQUAL (info.samplerate, 48000); - auto buffer = new int16_t[info.channels * 2000]; + std::vector buffer(info.channels * 2000); dcp::SoundAsset asset (dcp_file(film, "pcm")); auto reader = asset.start_read (); for (int i = 0; i < asset.intrinsic_duration(); ++i) { auto frame = reader->get_frame(i); sf_count_t this_time = min (info.frames, sf_count_t(2000)); - sf_readf_short (ref, buffer, this_time); + sf_readf_short (ref, buffer.data(), this_time); for (int j = 0; j < this_time; ++j) { BOOST_REQUIRE_EQUAL (frame->get(2, j) >> 8, buffer[j]); } info.frames -= this_time; } - - delete[] buffer; } @@ -157,14 +152,14 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test2) /* We don't want to test anything that requires resampling */ BOOST_REQUIRE_EQUAL (info.samplerate, 48000); - auto buffer = new int32_t[info.channels * 2000]; + std::vector buffer(info.channels * 2000); dcp::SoundAsset asset (dcp_file(film, "pcm")); auto reader = asset.start_read (); for (int i = 0; i < asset.intrinsic_duration(); ++i) { auto frame = reader->get_frame(i); sf_count_t this_time = min (info.frames, sf_count_t(2000)); - sf_readf_int (ref, buffer, this_time); + sf_readf_int (ref, buffer.data(), this_time); for (int j = 0; j < this_time; ++j) { int32_t s = frame->get(2, j); if (s > (1 << 23)) { @@ -174,8 +169,6 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test2) } info.frames -= this_time; } - - delete[] buffer; } @@ -192,14 +185,14 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test3) /* We don't want to test anything that requires resampling */ BOOST_REQUIRE_EQUAL (info.samplerate, 48000); - auto buffer = new int32_t[info.channels * 2000]; + std::vector buffer(info.channels * 2000); dcp::SoundAsset asset (dcp_file(film, "pcm")); auto reader = asset.start_read (); for (int i = 0; i < asset.intrinsic_duration(); ++i) { auto frame = reader->get_frame(i); sf_count_t this_time = min (info.frames, sf_count_t(2000)); - sf_readf_int (ref, buffer, this_time); + sf_readf_int (ref, buffer.data(), this_time); for (int j = 0; j < this_time; ++j) { int32_t s = frame->get(2, j); if (s > (1 << 23)) { @@ -209,6 +202,4 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test3) } info.frames -= this_time; } - - delete[] buffer; } diff --git a/test/socket_test.cc b/test/socket_test.cc index 6021d5172..bcdbcd724 100644 --- a/test/socket_test.cc +++ b/test/socket_test.cc @@ -43,7 +43,7 @@ class TestServer : public Server public: TestServer (bool digest) : Server (TEST_SERVER_PORT, 30) - , _buffer (new uint8_t[TEST_SERVER_BUFFER_LENGTH]) + , _buffer (TEST_SERVER_BUFFER_LENGTH) , _size (0) , _result (false) , _digest (digest) @@ -58,7 +58,6 @@ public: try { _thread.join (); } catch (...) {} - delete[] _buffer; } void expect (int size) @@ -68,7 +67,7 @@ public: } uint8_t const * buffer() const { - return _buffer; + return _buffer.data(); } void await () @@ -90,12 +89,12 @@ private: BOOST_REQUIRE (_size); if (_digest) { Socket::ReadDigestScope ds (socket); - socket->read (_buffer, _size); + socket->read (_buffer.data(), _size); _size = 0; _condition.notify_one (); _result = ds.check(); } else { - socket->read (_buffer, _size); + socket->read (_buffer.data(), _size); _size = 0; _condition.notify_one (); } @@ -104,7 +103,7 @@ private: boost::thread _thread; boost::mutex _mutex; boost::condition _condition; - uint8_t* _buffer; + std::vector _buffer; int _size; bool _result; bool _digest; diff --git a/test/test.cc b/test/test.cc index 7136b038d..e61387132 100644 --- a/test/test.cc +++ b/test/test.cc @@ -468,29 +468,26 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check) BOOST_CHECK (check_file); int const buffer_size = 65536; - uint8_t* ref_buffer = new uint8_t[buffer_size]; - uint8_t* check_buffer = new uint8_t[buffer_size]; + std::vector ref_buffer(buffer_size); + std::vector check_buffer(buffer_size); string error = "File " + check.string() + " differs from reference " + ref.string(); while (N) { uintmax_t this_time = min (uintmax_t (buffer_size), N); - size_t r = fread (ref_buffer, 1, this_time, ref_file); + size_t r = fread (ref_buffer.data(), 1, this_time, ref_file); BOOST_CHECK_EQUAL (r, this_time); - r = fread (check_buffer, 1, this_time, check_file); + r = fread (check_buffer.data(), 1, this_time, check_file); BOOST_CHECK_EQUAL (r, this_time); - BOOST_CHECK_MESSAGE (memcmp (ref_buffer, check_buffer, this_time) == 0, error); - if (memcmp (ref_buffer, check_buffer, this_time)) { + BOOST_CHECK_MESSAGE (memcmp(ref_buffer.data(), check_buffer.data(), this_time) == 0, error); + if (memcmp(ref_buffer.data(), check_buffer.data(), this_time)) { break; } N -= this_time; } - delete[] ref_buffer; - delete[] check_buffer; - fclose (ref_file); fclose (check_file); } @@ -511,17 +508,14 @@ check_text_file (boost::filesystem::path ref, boost::filesystem::path check) DCPOMATIC_ASSERT (buffer_size < 1024 * 1024); - auto ref_buffer = new uint8_t[buffer_size]; - auto ref_read = fread(ref_buffer, 1, buffer_size, ref_file); - auto check_buffer = new uint8_t[buffer_size]; - auto check_read = fread(check_buffer, 1, buffer_size, check_file); + std::vector ref_buffer(buffer_size); + auto ref_read = fread(ref_buffer.data(), 1, buffer_size, ref_file); + std::vector check_buffer(buffer_size); + auto check_read = fread(check_buffer.data(), 1, buffer_size, check_file); BOOST_CHECK_EQUAL (ref_read, check_read); string const error = "File " + check.string() + " differs from reference " + ref.string(); - BOOST_CHECK_MESSAGE(memcmp(ref_buffer, check_buffer, ref_read) == 0, error); - - delete[] ref_buffer; - delete[] check_buffer; + BOOST_CHECK_MESSAGE(memcmp(ref_buffer.data(), check_buffer.data(), ref_read) == 0, error); fclose (ref_file); fclose (check_file); -- 2.30.2