X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content_scale.cc;h=59ff4bd9b663d5fe0084192102668239ca7fc6b6;hb=ae15eeca8588c6928d7671894db98c2e289fa601;hp=14db7b02f7dd6bb97c3724fcccb4fa78c9ac3630;hpb=2e81be9e5b95fdba1049afc1ddef79e7a66980db;p=dcpomatic.git diff --git a/src/lib/video_content_scale.cc b/src/lib/video_content_scale.cc index 14db7b02f..59ff4bd9b 100644 --- a/src/lib/video_content_scale.cc +++ b/src/lib/video_content_scale.cc @@ -127,22 +127,22 @@ VideoContentScale::from_id (string id) * @param film_container The size of the film's image. */ dcp::Size -VideoContentScale::size (shared_ptr c, dcp::Size display_container, dcp::Size film_container, int round) const +VideoContentScale::size (shared_ptr c, dcp::Size display_container, dcp::Size film_container) const { /* Work out the size of the content if it were put inside film_container */ - dcp::Size video_size_after_crop = c->video_size_after_crop (); - + dcp::Size const video_size_after_crop = c->video_size_after_crop (); + dcp::Size size; if (_ratio) { /* Stretch to fit the requested ratio */ - size = fit_ratio_within (_ratio->ratio (), film_container, round); + size = fit_ratio_within (_ratio->ratio (), film_container); } else if (_scale || video_size_after_crop.width > film_container.width || video_size_after_crop.height > film_container.height) { /* Scale, preserving aspect ratio; this is either if we have been asked to scale with no stretch or if the unscaled content is too big for film_container. */ - size = fit_ratio_within (video_size_after_crop.ratio(), film_container, round); + size = fit_ratio_within (video_size_after_crop.ratio(), film_container); } else { /* No stretch nor scale */ size = video_size_after_crop;