projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9f116a9
)
Try to fix Arch build error reported by Markus.
author
Carl Hetherington
<cth@carlh.net>
Sun, 3 Jul 2016 19:36:02 +0000
(20:36 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Sun, 3 Jul 2016 19:36:02 +0000
(20:36 +0100)
test/time_calculation_test.cc
patch
|
blob
|
history
diff --git
a/test/time_calculation_test.cc
b/test/time_calculation_test.cc
index ddd685d0c33f2bb789ef1cce5567421c863958a8..6c7d69b25dedee9f9cf85e9a9b964c95084e507b 100644
(file)
--- a/
test/time_calculation_test.cc
+++ b/
test/time_calculation_test.cc
@@
-158,7
+158,7
@@
BOOST_AUTO_TEST_CASE (ffmpeg_time_calculation_test)
BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (1));
/* 25fps content, 24fps DCP; length should be increased */
film->set_video_frame_rate (24);
BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (1));
/* 25fps content, 24fps DCP; length should be increased */
film->set_video_frame_rate (24);
- BOOST_CHECK_SMALL (
abs (content->full_length().get() - DCPTime::from_seconds(25.0 / 24).get()), 2
);
+ BOOST_CHECK_SMALL (
labs (content->full_length().get() - DCPTime::from_seconds(25.0 / 24).get()), 2L
);
/* 25fps content, 30fps DCP; length should be decreased */
film->set_video_frame_rate (30);
BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (25.0 / 30));
/* 25fps content, 30fps DCP; length should be decreased */
film->set_video_frame_rate (30);
BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (25.0 / 30));