projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't disable forensic marking by default.
[dcpomatic.git]
/
src
/
lib
/
video_content_scale.cc
diff --git
a/src/lib/video_content_scale.cc
b/src/lib/video_content_scale.cc
index 59ff4bd9b663d5fe0084192102668239ca7fc6b6..636f0e807413972d7fa5cb1ea8161e755bd4fb7a 100644
(file)
--- 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>
/*
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.
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
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 "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 "util.h"
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <boost/optional.hpp>
+#include <iostream>
#include "i18n.h"
#include "i18n.h"
@@
-83,22
+84,18
@@
VideoContentScale::as_xml (xmlpp::Node* node) const
string
VideoContentScale::id () const
{
string
VideoContentScale::id () const
{
- SafeStringStream s;
-
if (_ratio) {
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) {
}
string
VideoContentScale::name () const
{
if (_ratio) {
- return _ratio->nickname ();
+ return _ratio->
image_
nickname ();
}
if (_scale) {
}
if (_scale) {
@@
-122,7
+119,7
@@
VideoContentScale::from_id (string id)
return VideoContentScale (true);
}
return VideoContentScale (true);
}
-
+
/** @param display_container Size of the container that we are displaying this content in.
* @param film_container The size of the film's image.
*/
/** @param display_container Size of the container that we are displaying this content in.
* @param film_container The size of the film's image.
*/
@@
-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 */
{
/* 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;
dcp::Size size;
@@
-154,9
+151,9
@@
VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size display_con
float (display_container.width) / film_container.width,
float (display_container.height) / film_container.height
);
float (display_container.width) / film_container.width,
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;
}
return size;