From 44a3a78fb6a3863c0c7f3c1193837337e68a67e4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 20 Nov 2008 23:24:08 -0600 Subject: Merge from fe-moved (bzr r6891) --- src/2geom/sweep.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/2geom/sweep.cpp') diff --git a/src/2geom/sweep.cpp b/src/2geom/sweep.cpp index 227c822bd..53b953255 100644 --- a/src/2geom/sweep.cpp +++ b/src/2geom/sweep.cpp @@ -9,10 +9,8 @@ std::vector > sweep_bounds(std::vector rs) { std::vector > pairs(rs.size()); for(unsigned i = 0; i < rs.size(); i++) { - if(!rs[i].isEmpty()) { - events.push_back(Event(rs[i].left(), i, false)); - events.push_back(Event(rs[i].right(), i, true)); - } + events.push_back(Event(rs[i].left(), i, false)); + events.push_back(Event(rs[i].right(), i, true)); } std::sort(events.begin(), events.end()); @@ -48,10 +46,8 @@ std::vector > sweep_bounds(std::vector a, std::vecto events[n].reserve(sz*2); for(unsigned i = 0; i < sz; i++) { Rect r = n ? b[i] : a[i]; - if(!r.isEmpty()) { - events[n].push_back(Event(r.left(), i, false)); - events[n].push_back(Event(r.right(), i, true)); - } + events[n].push_back(Event(r.left(), i, false)); + events[n].push_back(Event(r.right(), i, true)); } std::sort(events[n].begin(), events[n].end()); } -- cgit v1.2.3