summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-03-09 22:10:25 +0000
committerCarl Hetherington <cth@carlh.net>2014-03-09 22:10:25 +0000
commit6bc33bf8bbf13ab9aee0d3e455f62d98f9e527f4 (patch)
tree85c39f66153b03443e8d62a6978d5a89efd24b8f /src/lib
parentb5d2f083b2f8b260ac238bd06092773770605850 (diff)
Restore old behaviour of "no-stretch" mode with crop.
Reported-by: Markus Raab
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/video_content.cc6
1 files changed, 4 insertions, 2 deletions
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<const VideoContent> 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