Merge master.

[dcpomatic.git] / src / lib / video_content.cc

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index a8590ce55b4a70f23c3d6ec7519e59f3f9ee5219..0a3e378eecb1fda2f05ef3b6894659c6849386fe 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -192,7 +192,7 @@ VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
        dcp::Size const vs = d->video_size ();
        float const vfr = d->video_frame_rate ();
        ContentTime vl = d->video_length ();
-       
+
        {
                boost::mutex::scoped_lock lm (_mutex);
                _video_size = vs;
@@ -508,25 +508,25 @@ VideoContentScale::name () const
  *  @param film_container The size of the film's image.
  */
 dcp::Size
-VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size display_container, dcp::Size film_container) const
+VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size display_container, dcp::Size film_container, int round) const
 {
        if (_ratio) {
-               return fit_ratio_within (_ratio->ratio (), display_container);
+               return fit_ratio_within (_ratio->ratio (), display_container, round);
        }
 
        dcp::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 < ac.width || film_container.height < ac.height) {
-               return fit_ratio_within (ac.ratio (), display_container);
+               return fit_ratio_within (ac.ratio (), display_container, 1);
        }
 
        /* Scale the image so that it will be in the right place in film_container, even if display_container is a
           different size.
        */
        return dcp::Size (
-               c->video_size().width  * float(display_container.width)  / film_container.width,
-               c->video_size().height * float(display_container.height) / film_container.height
+               round_to (c->video_size().width  * float(display_container.width)  / film_container.width, round),
+               round_to (c->video_size().height * float(display_container.height) / film_container.height, round)
                );
 }