diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-02-07 15:28:34 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-02-07 15:28:34 +0000 |
| commit | 2e81be9e5b95fdba1049afc1ddef79e7a66980db (patch) | |
| tree | e89749d19bb0bf35c5be4af030b49a7d4976b1c3 /src/lib/video_content_scale.h | |
| parent | 4964bbe4efaaf8f8d7076cfcfed841300fd7a66d (diff) | |
Forward-port 41b77bee9c9cef485d95e82f16f6365ed1cf2a13 from 1.0; fixes to VideoContentScale::size().
Diffstat (limited to 'src/lib/video_content_scale.h')
| -rw-r--r-- | src/lib/video_content_scale.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/video_content_scale.h b/src/lib/video_content_scale.h index f5d97fd97..3053dda43 100644 --- a/src/lib/video_content_scale.h +++ b/src/lib/video_content_scale.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -43,7 +43,7 @@ public: VideoContentScale (bool); VideoContentScale (boost::shared_ptr<cxml::Node>); - dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size, dcp::Size, int round) const; + dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size display_container, dcp::Size film_container, int round) const; std::string id () const; std::string name () const; void as_xml (xmlpp::Node *) const; |