projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dc9dc1a
)
Fix overlaps; before you'd get a different answer
author
Carl Hetherington
<cth@carlh.net>
Mon, 31 Aug 2015 16:27:47 +0000
(17:27 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 31 Aug 2015 17:57:43 +0000
(18:57 +0100)
if you did a.overlaps(b) cf b.overlaps(a) if they were
just-not overlapping.
src/lib/dcpomatic_time.cc
patch
|
blob
|
history
diff --git
a/src/lib/dcpomatic_time.cc
b/src/lib/dcpomatic_time.cc
index 6f8f5efa2d4eb01b8b7249447c271ac79dc33bc4..28f76607499134933815f888815265fdbceae9c4 100644
(file)
--- a/
src/lib/dcpomatic_time.cc
+++ b/
src/lib/dcpomatic_time.cc
@@
-92,7
+92,7
@@
operator<< (ostream& s, DCPTime t)
bool
ContentTimePeriod::overlaps (ContentTimePeriod const & other) const
{
- return (from < other.to && to >
=
other.from);
+ return (from < other.to && to > other.from);
}
bool