No-op: remove all trailing whitespace.

[dcpomatic.git] / test / scaling_test.cc

diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index 704c2c7dab65086829bb19e271879cd40cd8e313..b6b38e1260e58ec4f98385a1f2f788c623eb842b 100644 (file)
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -56,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<ImageContent> imc (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
 
        film->examine_and_add_content (imc);
 
        wait_for_jobs ();
-       
-       imc->set_video_length (ContentTime::from_frames (1, 24));
 
+       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");
 }