diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-10 00:11:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-10 00:11:40 +0100 |
| commit | 9bced5ab9be5f35c42627d4635c8e500cb5090fa (patch) | |
| tree | b75cccaf998a3f130ae83a41811132c753af39af | |
| parent | 990c16a56a6d2dbe37f49f019ed13bc0ff2ae4db (diff) | |
Fix warnings.
| -rw-r--r-- | test/ffmpeg_examiner_test.cc | 2 | ||||
| -rw-r--r-- | test/test.cc | 3 | ||||
| -rw-r--r-- | test/video_decoder_fill_test.cc | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc index 26834aafc..a2f78c28a 100644 --- a/test/ffmpeg_examiner_test.cc +++ b/test/ffmpeg_examiner_test.cc @@ -37,6 +37,6 @@ BOOST_AUTO_TEST_CASE (ffmpeg_examiner_test) shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (content)); BOOST_CHECK_EQUAL (examiner->first_video().get(), ContentTime::from_seconds (600)); - BOOST_CHECK_EQUAL (examiner->audio_streams().size(), 1); + BOOST_CHECK_EQUAL (examiner->audio_streams().size(), 1U); BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->first_audio.get(), ContentTime::from_seconds (600)); } diff --git a/test/test.cc b/test/test.cc index 5dd591ddc..0636c6e48 100644 --- a/test/test.cc +++ b/test/test.cc @@ -46,6 +46,7 @@ using std::min; using std::cout; using std::cerr; using std::list; +using std::abs; using boost::shared_ptr; using boost::scoped_array; @@ -143,7 +144,7 @@ check_audio_file (boost::filesystem::path ref, boost::filesystem::path check) BOOST_CHECK_EQUAL (r, this_time); for (sf_count_t i = 0; i < this_time; ++i) { - BOOST_REQUIRE (fabs (ref_buffer[i] - check_buffer[i]) <= 65536); + BOOST_REQUIRE (abs (ref_buffer[i] - check_buffer[i]) <= 65536); } N -= this_time; diff --git a/test/video_decoder_fill_test.cc b/test/video_decoder_fill_test.cc index 9ee00450d..85dafd93f 100644 --- a/test/video_decoder_fill_test.cc +++ b/test/video_decoder_fill_test.cc @@ -33,7 +33,7 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test1) ImageDecoder decoder (c); decoder.fill_2d (0, 4); - BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 4); + BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 4U); list<ContentVideo>::iterator i = decoder._decoded_video.begin(); for (int j = 0; j < 4; ++j) { BOOST_CHECK_EQUAL (i->frame, j); |
