X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fscaling_test.cc;h=ed0461005f12376ba00e1b13fef07c3edd83c573;hb=9106e6ed551b13e1b7c7ee2088d54ce0ae430bcf;hp=4bb6551d39b1400dd17f14f1ee6404bdaaa50bb4;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git diff --git a/test/scaling_test.cc b/test/scaling_test.cc index 4bb6551d3..ed0461005 100644 --- a/test/scaling_test.cc +++ b/test/scaling_test.cc @@ -20,25 +20,25 @@ /** @file test/scaling_test.cc * @brief Test scaling and black-padding of images from a still-image source. + * @ingroup specific */ +#include #include "lib/image_content.h" #include "lib/ratio.h" #include "lib/film.h" #include "lib/dcp_content_type.h" #include "lib/video_content.h" #include "test.h" -#include -#include using std::string; using boost::shared_ptr; -using boost::make_shared; static void scaling_test_for (shared_ptr film, shared_ptr content, string image, string container) { content->video->set_scale (VideoContentScale (Ratio::from_id (image))); film->set_container (Ratio::from_id (container)); + film->set_interop (false); film->make_dcp (); wait_for_jobs (); @@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE (scaling_test) shared_ptr film = new_test_film ("scaling_test"); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); film->set_name ("scaling_test"); - shared_ptr imc = make_shared (film, "test/data/simple_testcard_640x480.png"); + shared_ptr imc (new ImageContent (film, "test/data/simple_testcard_640x480.png")); film->examine_and_add_content (imc);