X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fratio_test.cc;h=5ee8af1371ae5cbc588a2e0b02c9260e9f17dfee;hb=274e190de0f680f13e3dfc0dc35c69dfa8e15005;hp=946eac1640063ca8a0465ee083af9d840b29c0a3;hpb=b1f84f5635e4ebbd98882b39e5c5b19f62fe006e;p=dcpomatic.git diff --git a/test/ratio_test.cc b/test/ratio_test.cc index 946eac164..5ee8af137 100644 --- a/test/ratio_test.cc +++ b/test/ratio_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington 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 @@ -17,25 +17,18 @@ */ +/** @file test/ratio_test.cc + * @brief Test Ratio and fit_ratio_within(). + */ + #include #include -#include +#include #include "lib/ratio.h" #include "lib/util.h" 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 +41,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));