projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
[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..3053dda43f854ce444a1fc179631db42cb34a9f0 100644
(file)
--- a/
src/lib/video_content_scale.h
+++ b/
src/lib/video_content_scale.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
5
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
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
@@
-20,9
+20,9
@@
#ifndef DCPOMATIC_VIDEO_CONTENT_SCALE_H
#define DCPOMATIC_VIDEO_CONTENT_SCALE_H
#ifndef DCPOMATIC_VIDEO_CONTENT_SCALE_H
#define DCPOMATIC_VIDEO_CONTENT_SCALE_H
-#include <vector>
-#include <boost/shared_ptr.hpp>
#include <dcp/util.h>
#include <dcp/util.h>
+#include <boost/shared_ptr.hpp>
+#include <vector>
namespace cxml {
class Node;
namespace cxml {
class Node;
@@
-43,7
+43,7
@@
public:
VideoContentScale (bool);
VideoContentScale (boost::shared_ptr<cxml::Node>);
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;
std::string id () const;
std::string name () const;
void as_xml (xmlpp::Node *) const;