Remove Image/GraphicsMagick dependency.

[dcpomatic.git] / test / player_test.cc

diff --git a/test/player_test.cc b/test/player_test.cc
index 2e979eb44f5ea0b067972d5b47237ff7810428fe..e52a73e5e8acc7efcea935123f22c253172c6f25 100644 (file)
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -151,9 +151,9 @@ BOOST_AUTO_TEST_CASE (player_subframe_test)
 
        shared_ptr<Player> player (new Player(film));
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_black._periods.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_black._periods.size(), 1U);
        BOOST_CHECK (player->_black._periods.front() == DCPTimePeriod(DCPTime::from_frames(3 * 24, 24), DCPTime::from_frames(3 * 24 + 1, 24)));
-       BOOST_REQUIRE_EQUAL (player->_silent._periods.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_silent._periods.size(), 1U);
        BOOST_CHECK (player->_silent._periods.front() == DCPTimePeriod(DCPTime(289920), DCPTime::from_frames(3 * 24 + 1, 24)));
 }
 
@@ -223,12 +223,12 @@ BOOST_AUTO_TEST_CASE (player_seek_test)
                butler->seek (t, true);
                pair<shared_ptr<PlayerVideo>, DCPTime> video = butler->get_video(true, 0);
                BOOST_CHECK_EQUAL(video.second.get(), t.get());
-               write_image(video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true), String::compose("build/test/player_seek_test_%1.png", i), "RGB");
-               /* This 0.055 is empirically chosen (hopefully) to accept changes in rendering between the reference and a test machine
+               write_image(video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true), String::compose("build/test/player_seek_test_%1.png", i));
+               /* This 14.08 is empirically chosen (hopefully) to accept changes in rendering between the reference and a test machine
                   (17.10 and 16.04 seem to anti-alias a little differently) but to reject gross errors e.g. missing fonts or missing
                   text altogether.
                */
-               check_image(String::compose("test/data/player_seek_test_%1.png", i), String::compose("build/test/player_seek_test_%1.png", i), 0.055);
+               check_image(String::compose("test/data/player_seek_test_%1.png", i), String::compose("build/test/player_seek_test_%1.png", i), 14.08);
        }
 }
 
@@ -256,8 +256,8 @@ BOOST_AUTO_TEST_CASE (player_seek_test2)
                butler->seek (t, true);
                pair<shared_ptr<PlayerVideo>, DCPTime> video = butler->get_video(true, 0);
                BOOST_CHECK_EQUAL(video.second.get(), t.get());
-               write_image(video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true), String::compose("build/test/player_seek_test2_%1.png", i), "RGB");
-               check_image(String::compose("test/data/player_seek_test2_%1.png", i), String::compose("build/test/player_seek_test2_%1.png", i), 0.055);
+               write_image(video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true), String::compose("build/test/player_seek_test2_%1.png", i));
+               check_image(String::compose("test/data/player_seek_test2_%1.png", i), String::compose("build/test/player_seek_test2_%1.png", i), 14.08);
        }
 }
 
@@ -318,7 +318,7 @@ BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test)
        player->Text.connect (bind (&store, &out, _1, _2, _3, _4));
        while (!player->pass ()) {}
 
-       BOOST_CHECK_EQUAL (out.size(), 6);
+       BOOST_CHECK_EQUAL (out.size(), 6U);
 }
 
 /** Trigger a crash due to the assertion failure in Player::emit_audio */