diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-04-08 15:06:08 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-04-08 15:06:08 +0000 |
| commit | f332fa6dbb58ab6b8e17f9b720f334c5e2722812 (patch) | |
| tree | 2ead4c65ceb8f91aeb84628f9ca4849547d281c9 /src/helper/geom.cpp | |
| parent | merge from trunk (r12258) (diff) | |
| parent | Implement read/write of image-rendering property. To be used to control scaling. (diff) | |
| download | inkscape-f332fa6dbb58ab6b8e17f9b720f334c5e2722812.tar.gz inkscape-f332fa6dbb58ab6b8e17f9b720f334c5e2722812.zip | |
merge from trunk (r12272)
(bzr r11668.1.66)
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 eebc566f2..df0e4fcf2 100644 --- a/src/helper/geom.cpp +++ b/src/helper/geom.cpp @@ -282,12 +282,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 */ |