Fix crash with sub-sample push parts in AudioMerger.

[dcpomatic.git] / test / ratio_test.cc

diff --git a/test/ratio_test.cc b/test/ratio_test.cc
index f3784cad292d4ac5b2076d00e0a2174ae8075107..43f1d2a15b8cc8d58d8b5bccd26590fd94d7eea9 100644 (file)
--- a/test/ratio_test.cc
+++ b/test/ratio_test.cc
@@ -1,22 +1,28 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 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/>.
 
 */
 
+/** @file  test/ratio_test.cc
+ *  @brief Test Ratio class and fit_ratio_within().
+ *  @ingroup selfcontained
+ */
+
 #include <iostream>
 #include <boost/test/unit_test.hpp>
 #include <dcp/util.h>
@@ -25,17 +31,6 @@
 
 using std::ostream;
 
-namespace libdcp {
-       
-ostream&
-operator<< (ostream& s, dcp::Size const & t)
-{
-       s << t.width << "x" << t.height;
-       return s;
-}
-
-}
-
 BOOST_AUTO_TEST_CASE (ratio_test)
 {
        Ratio::setup_ratios ();
@@ -48,10 +43,6 @@ BOOST_AUTO_TEST_CASE (ratio_test)
        BOOST_CHECK (r);
        BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (1440, 1080));
 
-       r = Ratio::from_id ("137");
-       BOOST_CHECK (r);
-       BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (1480, 1080));
-
        r = Ratio::from_id ("138");
        BOOST_CHECK (r);
        BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (1485, 1080));
@@ -72,8 +63,7 @@ BOOST_AUTO_TEST_CASE (ratio_test)
        BOOST_CHECK (r);
        BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (2048, 858));
 
-       r = Ratio::from_id ("full-frame");
+       r = Ratio::from_id ("190");
        BOOST_CHECK (r);
        BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (2048, 1080));
 }
-