diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-10 19:52:20 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-10 19:52:20 +0100 |
| commit | bb1251a3b0abe2343962e126b690d97ebf8394c5 (patch) | |
| tree | ca816feb4cf1133d0eab20b90d90c4f9bef0908b /src/lib | |
| parent | 9bdd8cc51942a13e360dde4efc04b3ca417c8b94 (diff) | |
Fix the merge.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/format.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/format.cc b/src/lib/format.cc index cce8762bd..3d18edb3e 100644 --- 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) { |