X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content_scale.cc;h=636f0e807413972d7fa5cb1ea8161e755bd4fb7a;hb=75538d19688ad8c29c5949de9bff9f044c713936;hp=c8c29536117c83fc1e89db36c20cdbada8caf559;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git

diff --git a/src/lib/video_content_scale.cc b/src/lib/video_content_scale.cc
index c8c295361..636f0e807 100644
--- a/src/lib/video_content_scale.cc
+++ b/src/lib/video_content_scale.cc
@@ -1,30 +1,31 @@
 /*
     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/>.
 
 */
 
 #include "video_content_scale.h"
 #include "video_content.h"
 #include "ratio.h"
-#include "safe_stringstream.h"
 #include "util.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/optional.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -83,22 +84,18 @@ VideoContentScale::as_xml (xmlpp::Node* node) const
 string
 VideoContentScale::id () const
 {
-	SafeStringStream s;
-
 	if (_ratio) {
-		s << _ratio->id ();
-	} else {
-		s << (_scale ? "S1" : "S0");
+		return _ratio->id ();
 	}
 
-	return s.str ();
+	return (_scale ? "S1" : "S0");
 }
 
 string
 VideoContentScale::name () const
 {
 	if (_ratio) {
-		return _ratio->nickname ();
+		return _ratio->image_nickname ();
 	}
 
 	if (_scale) {
@@ -131,7 +128,7 @@ VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size display_con
 {
 	/* Work out the size of the content if it were put inside film_container */
 
-	dcp::Size const video_size_after_crop = c->video_size_after_crop ();
+	dcp::Size const video_size_after_crop = c->size_after_crop ();
 
 	dcp::Size size;
 
@@ -155,8 +152,8 @@ VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size display_con
 			float (display_container.height) / film_container.height
 			);
 
-		size.width = rint (size.width * scale);
-		size.height = rint (size.height * scale);
+		size.width = lrintf (size.width * scale);
+		size.height = lrintf (size.height * scale);
 	}
 
 	return size;