X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fscaling_test.cc;h=5ac5c7525cbb581704bd024439c00d6eea6a4172;hb=6996f3e291aec986adb1589808a54d09b8647520;hp=4bb6551d39b1400dd17f14f1ee6404bdaaa50bb4;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git diff --git a/test/scaling_test.cc b/test/scaling_test.cc index 4bb6551d3..5ac5c7525 100644 --- a/test/scaling_test.cc +++ b/test/scaling_test.cc @@ -22,18 +22,16 @@ * @brief Test scaling and black-padding of images from a still-image source. */ +#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) { @@ -62,7 +60,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);