Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

[dcpomatic.git] / src / lib / video_content_scale.h

diff --git a/src/lib/video_content_scale.h b/src/lib/video_content_scale.h
index d457d82f155465257490093f6f1418e8a42be2ef..1054234bc0d5a01edc0fff213a15c72c397c2fbf 100644 (file)
--- a/src/lib/video_content_scale.h
+++ b/src/lib/video_content_scale.h
@@ -1,28 +1,29 @@
 /*
-    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
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #ifndef DCPOMATIC_VIDEO_CONTENT_SCALE_H
 #define DCPOMATIC_VIDEO_CONTENT_SCALE_H
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
 #include <dcp/util.h>
+#include <boost/shared_ptr.hpp>
+#include <vector>
 
 namespace cxml {
        class Node;
@@ -43,7 +44,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) const;
        std::string id () const;
        std::string name () const;
        void as_xml (xmlpp::Node *) const;