diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-04-05 19:09:30 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-04-05 19:09:30 +0000 |
| commit | 38d12b0b147681fbaf6b773394ea20abf184732c (patch) | |
| tree | ea5cd0d25e50f8637214fed33dc5d973a60ac5ce /src/helper/geom.cpp | |
| parent | Merged FlowX classes. (diff) | |
| parent | Fix for Bug #1163759 (Mouse selection ignores transform). (diff) | |
| download | inkscape-38d12b0b147681fbaf6b773394ea20abf184732c.tar.gz inkscape-38d12b0b147681fbaf6b773394ea20abf184732c.zip | |
merged from trunk (r12265)
(bzr r11608.1.80)
Diffstat (limited to 'src/helper/geom.cpp')
| -rw-r--r-- | src/helper/geom.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/helper/geom.cpp b/src/helper/geom.cpp index 077344380..879026521 100644 --- a/src/helper/geom.cpp +++ b/src/helper/geom.cpp @@ -281,12 +281,12 @@ geom_cubic_bbox_wind_distance (Geom::Coord x000, Geom::Coord y000, y0 = std::min (y000, y001); y0 = std::min (y0, y011); y0 = std::min (y0, y111); - x1 = std::min (x000, x001); - x1 = std::min (x1, x011); - x1 = std::min (x1, x111); - y1 = std::min (y000, y001); - y1 = std::min (y1, y011); - y1 = std::min (y1, y111); + x1 = std::max (x000, x001); + x1 = std::max (x1, x011); + x1 = std::max (x1, x111); + y1 = std::max (y000, y001); + y1 = std::max (y1, y011); + y1 = std::max (y1, y111); if (best) { /* Quickly adjust to endpoints */ |