Fix the merge.

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

diff --git a/src/lib/format.cc b/src/lib/format.cc
index cce8762bdadd51766ef0cf01cd237c30f8892861..3d18edb3e51fedb2f8bd9dd56fe4f8d02951aa9a 100644 (file)
--- a/src/lib/format.cc
+++ b/src/lib/format.cc
@@ -200,7 +200,7 @@ FixedFormat::FixedFormat (int r, libdcp::Size dcp, string id, string n, string d
 int
 Format::dcp_padding (shared_ptr<const Film> f) const
 {
-       int p = rint ((_dcp_size.width - (_dcp_size.height * ratio(f))) / 2.0);
+       int p = rint ((_dcp_size.width - (_dcp_size.height * ratio_as_float(f))) / 2.0);
 
        /* This comes out -ve for Scope; bodge it */
        if (p < 0) {