Merge master.

[dcpomatic.git] / src / lib / ratio.cc

diff --git a/src/lib/ratio.cc b/src/lib/ratio.cc
index 5988b34188375eade8e2c8eac218de93b90bf141..275f4ef15ab5215a14b6679b6e52ed58b01b77dd 100644 (file)
--- a/src/lib/ratio.cc
+++ b/src/lib/ratio.cc
@@ -17,8 +17,9 @@
 
 */
 
-#include <libdcp/types.h>
+#include <dcp/types.h>
 #include "ratio.h"
+#include "util.h"
 
 #include "i18n.h"
 
@@ -28,27 +29,14 @@ using std::vector;
 
 vector<Ratio const *> Ratio::_ratios;
 
-libdcp::Size
-Ratio::size (libdcp::Size full_frame) const
-{
-       if (_ratio < static_cast<float>(full_frame.width) / full_frame.height) {
-               return libdcp::Size (full_frame.height * _ratio, full_frame.height);
-       } else {
-               return libdcp::Size (full_frame.width, full_frame.width / _ratio);
-       }
-
-       return libdcp::Size ();
-}
-
-
 void
 Ratio::setup_ratios ()
 {
-       _ratios.push_back (new Ratio (float(1285) / 1080, "119", _("1.19"), "F"));
-       _ratios.push_back (new Ratio (float(1436) / 1080, "133", _("4:3"), "F"));
+       _ratios.push_back (new Ratio (float(1290) / 1080, "119", _("1.19"), "F"));
+       _ratios.push_back (new Ratio (float(1440) / 1080, "133", _("4:3"), "F"));
        _ratios.push_back (new Ratio (float(1480) / 1080, "137", _("Academy"), "F"));
        _ratios.push_back (new Ratio (float(1485) / 1080, "138", _("1.375"), "F"));
-       _ratios.push_back (new Ratio (float(1793) / 1080, "166", _("1.66"), "F"));
+       _ratios.push_back (new Ratio (float(1800) / 1080, "166", _("1.66"), "F"));
        _ratios.push_back (new Ratio (float(1920) / 1080, "178", _("16:9"), "F"));
        _ratios.push_back (new Ratio (float(1998) / 1080, "185", _("Flat"), "F"));
        _ratios.push_back (new Ratio (float(2048) /  858, "239", _("Scope"), "S"));