X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fscaling_test.cc;h=b6b38e1260e58ec4f98385a1f2f788c623eb842b;hb=b048889b399367bf0fc8b905c7c0cf436d629f57;hp=fd700fbb9a0f4310830b70b3d0a4f61f968ea9ca;hpb=bbd20953701383dddc4c45d2ab317d55845d8b89;p=dcpomatic.git

diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index fd700fbb9..b6b38e126 100644
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,17 +17,23 @@
 
 */
 
-#include "imagemagick_content.h"
-
 /** @file test/scaling_test.cc
  *  @brief Test scaling and black-padding of images from a still-image source.
  */
 
+#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"
+
+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 ();
 
@@ -50,22 +56,28 @@ static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> co
 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_dcp_content_type (DCPContentType::from_isdcf_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);
 
 	wait_for_jobs ();
-	
+
 	imc->set_video_length (1);
 
+	/* F-133: 133 image in a flat container */
 	scaling_test_for (film, imc, "133", "185");
+	/* F: flat image in a flat container */
 	scaling_test_for (film, imc, "185", "185");
+	/* F-S: scope image in a flat container */
 	scaling_test_for (film, imc, "239", "185");
 
+	/* S-133: 133 image in a scope container */
 	scaling_test_for (film, imc, "133", "239");
+	/* S-F: flat image in a scope container */
 	scaling_test_for (film, imc, "185", "239");
+	/* S: scope image in a scope container */
 	scaling_test_for (film, imc, "239", "239");
 }