Hand-apply bb070db1b36020058b010057b08ae78e6243d2d0 from master.

diff --git a/ChangeLog b/ChangeLog
index 5d0338bc2d4070abc45bf7397fbbc767d92f822e..ba9012f0fd59756cf0def5437af6cfe7735e2b98 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-04-12  Carl Hetherington  <cth@carlh.net>
 
+       * Hand-apply c0e0b90d987af2586323d4a67bd67330256da51d from master;
+       remove 1.37 ratio and set Academy to 1.375.
+
        * Hand-apply 83f1ea8eacb4d56860ccdb9db5acdf12c6e71dfb from master;
        ellipsize filters strings if it is long.
 

diff --git a/src/lib/ratio.cc b/src/lib/ratio.cc
index 29c22c78deadde5d6517a4574192359384f97ce5..e9b57e2e13da1ba9f60fde4b458e37f0feeb28f3 100644 (file)
--- a/src/lib/ratio.cc
+++ b/src/lib/ratio.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 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
@@ -34,8 +34,7 @@ Ratio::setup_ratios ()
 {
        _ratios.push_back (new Ratio (float(1290) / 1080, "119", _("1.19"), "119"));
        _ratios.push_back (new Ratio (float(1440) / 1080, "133", _("4:3"), "133"));
-       _ratios.push_back (new Ratio (float(1480) / 1080, "137", _("Academy"), "137"));
-       _ratios.push_back (new Ratio (float(1485) / 1080, "138", _("1.375"), "137"));
+       _ratios.push_back (new Ratio (float(1485) / 1080, "138", _("Academy"), "137"));
        _ratios.push_back (new Ratio (float(1800) / 1080, "166", _("1.66"), "166"));
        _ratios.push_back (new Ratio (float(1920) / 1080, "178", _("16:9"), "178"));
        _ratios.push_back (new Ratio (float(1998) / 1080, "185", _("Flat"), "F"));