projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Untested merge of master.
[dcpomatic.git]
/
src
/
lib
/
format.h
diff --git
a/src/lib/format.h
b/src/lib/format.h
index e953062329d9b583a0cfd078159499fb991320dc..f240c89fc85db4b76ee45f34291e8294dfdbd5b4 100644
(file)
--- a/
src/lib/format.h
+++ b/
src/lib/format.h
@@
-41,7
+41,7
@@
public:
/** @return the ratio of the container (including any padding) */
float container_ratio () const;
/** @return the ratio of the container (including any padding) */
float container_ratio () const;
- int dcp_padding (boost::shared_ptr<const Film>
f
) const;
+ int dcp_padding (boost::shared_ptr<const Film>) const;
/** @return size in pixels of the images that we should
* put in a DCP for this ratio. This size will not correspond
/** @return size in pixels of the images that we should
* put in a DCP for this ratio. This size will not correspond