From 110d7d4e111c2db31489296587d855328c5d8b34 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 24 Oct 2012 23:58:26 +0100 Subject: Fix shared_ptr for Film. --- src/lib/format.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/lib/format.cc') diff --git a/src/lib/format.cc b/src/lib/format.cc index 2eb4990da..eb42593fe 100644 --- a/src/lib/format.cc +++ b/src/lib/format.cc @@ -30,7 +30,11 @@ #include "format.h" #include "film.h" -using namespace std; +using std::string; +using std::setprecision; +using std::stringstream; +using std::vector; +using boost::shared_ptr; vector Format::_formats; @@ -143,7 +147,7 @@ FixedFormat::FixedFormat (int r, Size dcp, string id, string n, string d) } int -Format::dcp_padding (Film const * f) const +Format::dcp_padding (shared_ptr f) const { int p = rint ((_dcp_size.width - (_dcp_size.height * ratio_as_integer(f) / 100.0)) / 2.0); @@ -162,13 +166,13 @@ VariableFormat::VariableFormat (Size dcp, string id, string n, string d) } int -VariableFormat::ratio_as_integer (Film const * f) const +VariableFormat::ratio_as_integer (shared_ptr f) const { return rint (ratio_as_float (f) * 100); } float -VariableFormat::ratio_as_float (Film const * f) const +VariableFormat::ratio_as_float (shared_ptr f) const { return float (f->size().width) / f->size().height; } -- cgit v1.2.3