diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2014-01-12 23:25:39 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2014-01-12 23:25:39 +0000 |
| commit | 5eb9b4815a12cc0dafd07905f7715a7e15a92b41 (patch) | |
| tree | f39f5ae5a40012fa010402611d2b133553c22335 /src/2geom/interval.h | |
| parent | LPE: rename function getHelperPaths --> getCanvasIndicators (the function is ... (diff) | |
| download | inkscape-5eb9b4815a12cc0dafd07905f7715a7e15a92b41.tar.gz inkscape-5eb9b4815a12cc0dafd07905f7715a7e15a92b41.zip | |
update 2geom's copy to r2142
(bzr r12921)
Diffstat (limited to 'src/2geom/interval.h')
| -rw-r--r-- | src/2geom/interval.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/2geom/interval.h b/src/2geom/interval.h index b1fac04d9..1714435be 100644 --- a/src/2geom/interval.h +++ b/src/2geom/interval.h @@ -114,9 +114,9 @@ public: /** @brief Check whether the interior of the interval includes the given interval. * Interior means all numbers in the interval except its ends. */ bool interiorContains(Interval const &val) const { return min() < val.min() && val.max() < max(); } - /** @brief Check whether the interiors of the intervals have any common elements. */ + /** @brief Check whether the interiors of the intervals have any common elements. A single point in common is not considered an intersection. */ bool interiorIntersects(Interval const &val) const { - return interiorContains(val.min()) || interiorContains(val.max()) || val.interiorContains(*this); + return std::max(min(), val.min()) < std::min(max(), val.max()); } /// @} |