summaryrefslogtreecommitdiffstats
path: root/src/2geom/sweep.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2015-04-27 23:39:29 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2015-04-27 23:39:29 +0000
commitc883d7627a479c8c5b6a9f77b9841fa5631572ad (patch)
treefba1186e26a8cc85a1b0728425bef6f2e9aeccd9 /src/2geom/sweep.cpp
parentextensions. ink2canvas.py - do not parse html comments. (Bug 1446204) (diff)
downloadinkscape-c883d7627a479c8c5b6a9f77b9841fa5631572ad.tar.gz
inkscape-c883d7627a479c8c5b6a9f77b9841fa5631572ad.zip
2Geom sync - initial commit
(bzr r14059.2.1)
Diffstat (limited to 'src/2geom/sweep.cpp')
-rw-r--r--src/2geom/sweep.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/2geom/sweep.cpp b/src/2geom/sweep.cpp
index f25894282..6910d5d02 100644
--- a/src/2geom/sweep.cpp
+++ b/src/2geom/sweep.cpp
@@ -19,8 +19,8 @@ std::vector<std::vector<unsigned> > sweep_bounds(std::vector<Rect> rs, Dim2 d) {
std::vector<std::vector<unsigned> > pairs(rs.size());
for(unsigned i = 0; i < rs.size(); i++) {
- events.push_back(Event(rs[i][d][0], i, false));
- events.push_back(Event(rs[i][d][1], i, true));
+ events.push_back(Event(rs[i][d].min(), i, false));
+ events.push_back(Event(rs[i][d].max(), i, true));
}
std::sort(events.begin(), events.end());
@@ -66,8 +66,8 @@ std::vector<std::vector<unsigned> > sweep_bounds(std::vector<Rect> a, std::vecto
events[n].reserve(sz*2);
for(unsigned i = 0; i < sz; i++) {
Rect r = n ? b[i] : a[i];
- events[n].push_back(Event(r[d][0], i, false));
- events[n].push_back(Event(r[d][1], i, true));
+ events[n].push_back(Event(r[d].min(), i, false));
+ events[n].push_back(Event(r[d].max(), i, true));
}
std::sort(events[n].begin(), events[n].end());
}