Change video content scaling so that it either:

[dcpomatic.git] / src / lib / util.h

diff --git a/src/lib/util.h b/src/lib/util.h
index 12c79ea5a374cabe566d751e9f5c250db71b22ba..f7b4704ace52caa583c2d09fb85926ba4a050aa7 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -116,6 +116,7 @@ extern void copy_in_bits (boost::filesystem::path from, boost::filesystem::path
 extern boost::shared_ptr<dcp::CertificateChain> read_swaroop_chain (boost::filesystem::path path);
 extern void write_swaroop_chain (boost::shared_ptr<const dcp::CertificateChain> chain, boost::filesystem::path output);
 #endif
+extern dcp::Size scale_for_display (dcp::Size s, dcp::Size display_container, dcp::Size film_container);
 
 template <class T>
 std::list<T>
@@ -128,6 +129,17 @@ vector_to_list (std::vector<T> v)
        return l;
 }
 
+template <class T>
+std::vector<T>
+list_to_vector (std::list<T> v)
+{
+       std::vector<T> l;
+       BOOST_FOREACH (T& i, v) {
+               l.push_back (i);
+       }
+       return l;
+}
+
 extern double db_to_linear (double db);
 extern double linear_to_db (double linear);