Supporters update.

[dcpomatic.git] / test / guess_crop_test.cc

diff --git a/test/guess_crop_test.cc b/test/guess_crop_test.cc
index c26fc5ee46afa8b61166fa2705f20f0491878466..ccced0b3ef495435115ffabd043e1af8f494b164 100644 (file)
--- a/test/guess_crop_test.cc
+++ b/test/guess_crop_test.cc
@@ -22,7 +22,6 @@
 #include "lib/content.h"
 #include "lib/content_factory.h"
 #include "lib/guess_crop.h"
-#include "lib/types.h"
 #include "lib/video_content.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
@@ -35,35 +34,26 @@ using namespace dcpomatic;
 
 BOOST_AUTO_TEST_CASE (guess_crop_image_test1)
 {
-       auto content = content_factory(TestPaths::private_data() / "arrietty_724.tiff").front();
-       auto film = new_test_film2 ("guess_crop_image_test1", { content });
+       auto content = content_factory(TestPaths::private_data() / "arrietty_724.tiff");
+       auto film = new_test_film2 ("guess_crop_image_test1", content);
 
-       BOOST_CHECK (
-               guess_crop(film, content, 0.1, ContentTime::from_frames(content->video->length(), content->video_frame_rate().get()))
-               == Crop(0, 0, 11, 11)
-               );
+       BOOST_CHECK (guess_crop(film, content[0], 0.1, {}) == Crop(0, 0, 11, 11));
 }
 
 
 BOOST_AUTO_TEST_CASE (guess_crop_image_test2)
 {
-       auto content = content_factory(TestPaths::private_data() / "prophet_frame.tiff").front();
-       auto film = new_test_film2 ("guess_crop_image_test2", { content });
+       auto content = content_factory(TestPaths::private_data() / "prophet_frame.tiff");
+       auto film = new_test_film2 ("guess_crop_image_test2", content);
 
-       BOOST_CHECK (
-               guess_crop(film, content, 0.1, ContentTime::from_frames(content->video->length(), content->video_frame_rate().get()))
-               == Crop(0, 0, 22, 22)
-               );
+       BOOST_CHECK(guess_crop(film, content[0], 0.1, {}) == Crop(0, 0, 22, 22));
 }
 
 
 BOOST_AUTO_TEST_CASE (guess_crop_image_test3)
 {
-       auto content = content_factory(TestPaths::private_data() / "pillarbox.png").front();
-       auto film = new_test_film2 ("guess_crop_image_test3", { content });
+       auto content = content_factory(TestPaths::private_data() / "pillarbox.png");
+       auto film = new_test_film2 ("guess_crop_image_test3", content);
 
-       BOOST_CHECK (
-               guess_crop(film, content, 0.1, ContentTime::from_frames(content->video->length(), content->video_frame_rate().get()))
-               == Crop(113, 262, 0, 0)
-               );
+       BOOST_CHECK(guess_crop(film, content[0], 0.1, {}) == Crop(113, 262, 0, 0));
 }