Back-port v2's rename and slight extension of FrameRateConversion.

[dcpomatic.git] / test / scaling_test.cc

diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index fd700fbb9a0f4310830b70b3d0a4f61f968ea9ca..f0cf3fe4a5bf89a3b473abac7af75d9071b89076 100644 (file)
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -17,17 +17,23 @@
 
 */
 
-#include "imagemagick_content.h"
+#include <boost/test/unit_test.hpp>
+#include "lib/image_content.h"
+#include "lib/ratio.h"
+#include "lib/film.h"
+#include "lib/dcp_content_type.h"
+#include "test.h"
 
 /** @file test/scaling_test.cc
  *  @brief Test scaling and black-padding of images from a still-image source.
  */
 
+using std::string;
 using boost::shared_ptr;
 
 static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> content, string image, string container)
 {
-       content->set_ratio (Ratio::from_id (image));
+       content->set_scale (VideoContentScale (Ratio::from_id (image)));
        film->set_container (Ratio::from_id (container));
        film->make_dcp ();
 
@@ -52,7 +58,7 @@ BOOST_AUTO_TEST_CASE (scaling_test)
        shared_ptr<Film> film = new_test_film ("scaling_test");
        film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
        film->set_name ("scaling_test");
-       shared_ptr<ImageMagickContent> imc (new ImageMagickContent (film, "test/data/simple_testcard_640x480.png"));
+       shared_ptr<ImageContent> imc (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
 
        film->examine_and_add_content (imc);