From 6bc33bf8bbf13ab9aee0d3e455f62d98f9e527f4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 9 Mar 2014 22:10:25 +0000 Subject: [PATCH] Restore old behaviour of "no-stretch" mode with crop. Reported-by: Markus Raab --- ChangeLog | 2 ++ src/lib/video_content.cc | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4bb6b732b..5ce1b0eb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-03-09 Carl Hetherington + * Restore old behaviour of "no-stretch" mode with crop. + * Fix display of no-scale display mode in the player. 2014-03-08 Carl Hetherington diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 82f817654..966b8e8b3 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -453,9 +453,11 @@ VideoContentScale::size (shared_ptr c, libdcp::Size display_ return fit_ratio_within (_ratio->ratio (), display_container); } + libdcp::Size const ac = c->video_size_after_crop (); + /* Force scale if the film_container is smaller than the content's image */ - if (_scale || film_container.width < c->video_size().width || film_container.height < c->video_size().height) { - return fit_ratio_within (c->video_size().ratio (), display_container); + if (_scale || film_container.width < ac.width || film_container.height < ac.height) { + return fit_ratio_within (ac.ratio (), display_container); } /* Scale the image so that it will be in the right place in film_container, even if display_container is a -- 2.30.2