X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fratio.cc;h=82602d2f2b24a48a722a9830591f9dbf16a58bbb;hb=9fc3a67c727896d2170888ae60c9745ebbfdca95;hp=29c22c78deadde5d6517a4574192359384f97ce5;hpb=4dbc6ef917aeceb906b1ef1caf6911033e7e2c54;p=dcpomatic.git

diff --git a/src/lib/ratio.cc b/src/lib/ratio.cc
index 29c22c78d..82602d2f2 100644
--- a/src/lib/ratio.cc
+++ b/src/lib/ratio.cc
@@ -1,19 +1,20 @@
 /*
-    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
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -34,11 +35,12 @@ 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(1544) / 1080, "143", _("IMAX"), "143"));
 	_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"));
+	_ratios.push_back (new Ratio (float(2048) /  872, "235", _("2.35"), "S"));
 	_ratios.push_back (new Ratio (float(2048) /  858, "239", _("Scope"), "S"));
 	_ratios.push_back (new Ratio (float(2048) / 1080, "full-frame", _("Full frame"), "C"));
 }
@@ -46,6 +48,11 @@ Ratio::setup_ratios ()
 Ratio const *
 Ratio::from_id (string i)
 {
+	/* We removed the ratio with id 137; replace it with 138 */
+	if (i == "137") {
+		i = "138";
+	}
+
 	vector<Ratio const *>::iterator j = _ratios.begin ();
 	while (j != _ratios.end() && (*j)->id() != i) {
 		++j;
@@ -73,13 +80,13 @@ Ratio::from_ratio (float r)
 
 	return *j;
 }
-   
+
 Ratio const *
 Ratio::nearest_from_ratio (float r)
 {
 	Ratio const * nearest = 0;
 	float distance = FLT_MAX;
-	
+
 	for (vector<Ratio const *>::iterator i = _ratios.begin (); i != _ratios.end(); ++i) {
 		float const d = fabs ((*i)->ratio() - r);
 		if (d < distance) {