Merge master.

[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 87dd2f1fafec05b49706c71f226d58cabadc495e..6b718d5741e09380d47abaff3e42268937178471 100644 (file)
--- a/src/lib/video_content_scale.h
+++ b/src/lib/video_content_scale.h
@@ -22,7 +22,7 @@
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
-#include <libdcp/util.h>
+#include <dcp/util.h>
 
 namespace cxml {
        class Node;
@@ -43,7 +43,7 @@ public:
        VideoContentScale (bool);
        VideoContentScale (boost::shared_ptr<cxml::Node>);
 
-       libdcp::Size size (boost::shared_ptr<const VideoContent>, libdcp::Size, libdcp::Size) const;
+       dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size, dcp::Size, int round) const;
        std::string id () const;
        std::string name () const;
        void as_xml (xmlpp::Node *) const;