X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Futil.cc;h=c165a5129bae42bfe646b772d56d246a7102935f;hb=3e0e3b10667d8ba2882fb307de3696e66fc357df;hp=d3af74376a3cd2349eeceafa9ab3ab35f5dc9423;hpb=67ff55886b1ee86d99c2ea27d10c73b85b0504b7;p=dcpomatic.git

diff --git a/src/lib/util.cc b/src/lib/util.cc
index d3af74376..c165a5129 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -406,7 +406,7 @@ DCPOMATIC_ENABLE_WARNINGS
 	list<StringText> subs;
 	dcp::SubtitleString ss(
 		optional<string>(), false, false, false, dcp::Colour(), 42, 1, dcp::Time(), dcp::Time(), 0, dcp::HAlign::CENTER, 0, dcp::VAlign::CENTER, dcp::Direction::LTR,
-		"Hello dolly", dcp::Effect::NONE, dcp::Colour(), dcp::Time(), dcp::Time()
+		"Hello dolly", dcp::Effect::NONE, dcp::Colour(), dcp::Time(), dcp::Time(), 0
 		);
 	subs.push_back (StringText(ss, 0));
 	render_text (subs, list<shared_ptr<Font>>(), dcp::Size(640, 480), DCPTime(), 24);
@@ -1111,7 +1111,7 @@ linear_to_db (double linear)
 
 
 dcp::Size
-scale_for_display (dcp::Size s, dcp::Size display_container, dcp::Size film_container)
+scale_for_display (dcp::Size s, dcp::Size display_container, dcp::Size film_container, PixelQuanta quanta)
 {
 	/* Now scale it down if the display container is smaller than the film container */
 	if (display_container != film_container) {
@@ -1122,6 +1122,7 @@ scale_for_display (dcp::Size s, dcp::Size display_container, dcp::Size film_cont
 
 		s.width = lrintf (s.width * scale);
 		s.height = lrintf (s.height * scale);
+		s = quanta.round (s);
 	}
 
 	return s;