Apply the remainder of a 1.x patch; a test.

diff --git a/TO_PORT b/TO_PORT
index 9130fc773950114f7dd7cf94fc94b2b911018852..25d41bda0f9767e4c95e9b429ca7458144db1d37 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,4 +1,3 @@
-e6c9d208c52fb6f8bc29469e7d263bd03b22fe48
 31894d178c8f6a3378b1c25c7ea1971f78759156
 bb2bdf010dd2ea813f9ac7af5023ce39cf14f572
 c065accc4b4c6ed268e7fccea77a958473be7785

diff --git a/test/video_content_scale_test.cc b/test/video_content_scale_test.cc
index 383d87ec54d083422d78c10f32d8282d8629e54c..a2fb7fd434c400e27a374cced22cb72bcd80167a 100644 (file)
--- a/test/video_content_scale_test.cc
+++ b/test/video_content_scale_test.cc
@@ -180,3 +180,18 @@ BOOST_AUTO_TEST_CASE (video_content_scale_test_to_ratio)
                dcp::Size (185, 100)
                );
 }
+
+/* Test no scale */
+BOOST_AUTO_TEST_CASE (video_content_scale_no_scale)
+{
+       /* No scale where the content is bigger than even the film container */
+       test (
+               dcp::Size (1920, 1080),
+               dcp::Size (887, 371),
+               dcp::Size (2048, 858),
+               Crop (),
+               0,
+               false,
+               dcp::Size (659, 371)
+               );
+}