X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fratio_test.cc;h=43f1d2a15b8cc8d58d8b5bccd26590fd94d7eea9;hp=84e80861b14cf3f0abb8daae63a781edbf884513;hb=95f4d8740de74cdecf6658ab2607c0af9732904e;hpb=e6c67f4aac2ca9afc275b6f13058e1e46f2cecc3 diff --git a/test/ratio_test.cc b/test/ratio_test.cc index 84e80861b..43f1d2a15 100644 --- a/test/ratio_test.cc +++ b/test/ratio_test.cc @@ -1,24 +1,26 @@ /* Copyright (C) 2012-2014 Carl Hetherington - 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 . */ /** @file test/ratio_test.cc - * @brief Test Ratio and fit_ratio_within(). + * @brief Test Ratio class and fit_ratio_within(). + * @ingroup selfcontained */ #include @@ -41,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)); @@ -65,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)); } -