X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fratio_test.cc;h=f3cbb504f0b874b9d5ef97b65d681b2e91ff33f3;hb=8b842865451795d5e8f8b39691c210de1ed5dd4f;hp=6311976a3519a33fec3b0269e3f17e0f7e8eced1;hpb=a183c1776cfd020a37d028ebb0f641352f49697b;p=dcpomatic.git

diff --git a/test/ratio_test.cc b/test/ratio_test.cc
index 6311976a3..f3cbb504f 100644
--- a/test/ratio_test.cc
+++ b/test/ratio_test.cc
@@ -17,6 +17,12 @@
 
 */
 
+#include <iostream>
+#include <boost/test/unit_test.hpp>
+#include <libdcp/util.h>
+#include "lib/ratio.h"
+#include "lib/util.h"
+
 using std::ostream;
 
 namespace libdcp {
@@ -36,38 +42,38 @@ BOOST_AUTO_TEST_CASE (ratio_test)
 
 	Ratio const * r = Ratio::from_id ("119");
 	BOOST_CHECK (r);
-	BOOST_CHECK_EQUAL (r->size(libdcp::Size (2048, 1080)), libdcp::Size (1285, 1080));
+	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), libdcp::Size (2048, 1080)), libdcp::Size (1290, 1080));
 
 	r = Ratio::from_id ("133");
 	BOOST_CHECK (r);
-	BOOST_CHECK_EQUAL (r->size(libdcp::Size (2048, 1080)), libdcp::Size (1436, 1080));
+	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), libdcp::Size (2048, 1080)), libdcp::Size (1440, 1080));
 
 	r = Ratio::from_id ("137");
 	BOOST_CHECK (r);
-	BOOST_CHECK_EQUAL (r->size(libdcp::Size (2048, 1080)), libdcp::Size (1480, 1080));
+	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), libdcp::Size (2048, 1080)), libdcp::Size (1480, 1080));
 
 	r = Ratio::from_id ("138");
 	BOOST_CHECK (r);
-	BOOST_CHECK_EQUAL (r->size(libdcp::Size (2048, 1080)), libdcp::Size (1485, 1080));
+	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), libdcp::Size (2048, 1080)), libdcp::Size (1485, 1080));
 
 	r = Ratio::from_id ("166");
 	BOOST_CHECK (r);
-	BOOST_CHECK_EQUAL (r->size(libdcp::Size (2048, 1080)), libdcp::Size (1793, 1080));
+	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), libdcp::Size (2048, 1080)), libdcp::Size (1800, 1080));
 
 	r = Ratio::from_id ("178");
 	BOOST_CHECK (r);
-	BOOST_CHECK_EQUAL (r->size(libdcp::Size (2048, 1080)), libdcp::Size (1920, 1080));
+	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), libdcp::Size (2048, 1080)), libdcp::Size (1920, 1080));
 
 	r = Ratio::from_id ("185");
 	BOOST_CHECK (r);
-	BOOST_CHECK_EQUAL (r->size(libdcp::Size (2048, 1080)), libdcp::Size (1998, 1080));
+	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), libdcp::Size (2048, 1080)), libdcp::Size (1998, 1080));
 
 	r = Ratio::from_id ("239");
 	BOOST_CHECK (r);
-	BOOST_CHECK_EQUAL (r->size(libdcp::Size (2048, 1080)), libdcp::Size (2048, 858));
+	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), libdcp::Size (2048, 1080)), libdcp::Size (2048, 858));
 
 	r = Ratio::from_id ("full-frame");
 	BOOST_CHECK (r);
-	BOOST_CHECK_EQUAL (r->size(libdcp::Size (2048, 1080)), libdcp::Size (2048, 1080));
+	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), libdcp::Size (2048, 1080)), libdcp::Size (2048, 1080));
 }