projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
test
/
ratio_test.cc
diff --git
a/test/ratio_test.cc
b/test/ratio_test.cc
index 6311976a3519a33fec3b0269e3f17e0f7e8eced1..eab30ceee02ab3d098b8935d516551fbbc7d8060 100644
(file)
--- a/
test/ratio_test.cc
+++ b/
test/ratio_test.cc
@@
-1,5
+1,5
@@
/*
/*
- 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
it under the terms of the GNU General Public License as published by
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,18
+17,17
@@
*/
*/
-using std::ostream;
+/** @file test/ratio_test.cc
+ * @brief Test Ratio and fit_ratio_within().
+ */
-namespace libdcp {
-
-ostream&
-operator<< (ostream& s, libdcp::Size const & t)
-{
- s << t.width << "x" << t.height;
- return s;
-}
+#include <iostream>
+#include <boost/test/unit_test.hpp>
+#include <dcp/util.h>
+#include "lib/ratio.h"
+#include "lib/util.h"
-}
+using std::ostream;
BOOST_AUTO_TEST_CASE (ratio_test)
{
BOOST_AUTO_TEST_CASE (ratio_test)
{
@@
-36,38
+35,38
@@
BOOST_AUTO_TEST_CASE (ratio_test)
Ratio const * r = Ratio::from_id ("119");
BOOST_CHECK (r);
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(), dcp::Size (2048, 1080), 1), dcp::Size (1290
, 1080));
r = Ratio::from_id ("133");
BOOST_CHECK (r);
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(), dcp::Size (2048, 1080), 1), dcp::Size (1440
, 1080));
r = Ratio::from_id ("137");
BOOST_CHECK (r);
r = Ratio::from_id ("137");
BOOST_CHECK (r);
- BOOST_CHECK_EQUAL (
r->size(libdcp::Size (2048, 1080)), lib
dcp::Size (1480, 1080));
+ BOOST_CHECK_EQUAL (
fit_ratio_within (r->ratio(), dcp::Size (2048, 1080), 1),
dcp::Size (1480, 1080));
r = Ratio::from_id ("138");
BOOST_CHECK (r);
r = Ratio::from_id ("138");
BOOST_CHECK (r);
- BOOST_CHECK_EQUAL (
r->size(libdcp::Size (2048, 1080)), lib
dcp::Size (1485, 1080));
+ BOOST_CHECK_EQUAL (
fit_ratio_within (r->ratio(), dcp::Size (2048, 1080), 1),
dcp::Size (1485, 1080));
r = Ratio::from_id ("166");
BOOST_CHECK (r);
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(), dcp::Size (2048, 1080), 1), dcp::Size (1800
, 1080));
r = Ratio::from_id ("178");
BOOST_CHECK (r);
r = Ratio::from_id ("178");
BOOST_CHECK (r);
- BOOST_CHECK_EQUAL (
r->size(libdcp::Size (2048, 1080)), lib
dcp::Size (1920, 1080));
+ BOOST_CHECK_EQUAL (
fit_ratio_within (r->ratio(), dcp::Size (2048, 1080), 1),
dcp::Size (1920, 1080));
r = Ratio::from_id ("185");
BOOST_CHECK (r);
r = Ratio::from_id ("185");
BOOST_CHECK (r);
- BOOST_CHECK_EQUAL (
r->size(libdcp::Size (2048, 1080)), lib
dcp::Size (1998, 1080));
+ BOOST_CHECK_EQUAL (
fit_ratio_within (r->ratio(), dcp::Size (2048, 1080), 1),
dcp::Size (1998, 1080));
r = Ratio::from_id ("239");
BOOST_CHECK (r);
r = Ratio::from_id ("239");
BOOST_CHECK (r);
- BOOST_CHECK_EQUAL (
r->size(libdcp::Size (2048, 1080)), lib
dcp::Size (2048, 858));
+ BOOST_CHECK_EQUAL (
fit_ratio_within (r->ratio(), dcp::Size (2048, 1080), 1),
dcp::Size (2048, 858));
r = Ratio::from_id ("full-frame");
BOOST_CHECK (r);
r = Ratio::from_id ("full-frame");
BOOST_CHECK (r);
- BOOST_CHECK_EQUAL (
r->size(libdcp::Size (2048, 1080)), lib
dcp::Size (2048, 1080));
+ BOOST_CHECK_EQUAL (
fit_ratio_within (r->ratio(), dcp::Size (2048, 1080), 1),
dcp::Size (2048, 1080));
}
}