diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-03-29 23:52:42 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-03-29 23:52:42 +0000 |
| commit | a168040d5a452544328a1e6ad35aaac351f94d44 (patch) | |
| tree | fae1ba829f543a473da281bd5fa6e4deabbf6912 /src/helper/geom.cpp | |
| parent | Removed function pointers from SPObject and subclasses. (diff) | |
| parent | Dutch translation update (diff) | |
| download | inkscape-a168040d5a452544328a1e6ad35aaac351f94d44.tar.gz inkscape-a168040d5a452544328a1e6ad35aaac351f94d44.zip | |
merged from trunk
(bzr r11608.1.56)
Diffstat (limited to 'src/helper/geom.cpp')
| -rw-r--r-- | src/helper/geom.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/helper/geom.cpp b/src/helper/geom.cpp index 3e63df1ac..077344380 100644 --- a/src/helper/geom.cpp +++ b/src/helper/geom.cpp @@ -9,6 +9,7 @@ * Released under GNU GPL */ +#include <algorithm> #include "helper/geom.h" #include "helper/geom-curves.h" #include <typeinfo> @@ -20,7 +21,6 @@ #include <2geom/rect.h> #include <2geom/coord.h> #include <2geom/sbasis-to-bezier.h> -#include <glibmm.h> using Geom::X; using Geom::Y; @@ -275,18 +275,18 @@ geom_cubic_bbox_wind_distance (Geom::Coord x000, Geom::Coord y000, if (bbox) cubic_bbox (x000, y000, x001, y001, x011, y011, x111, y111, *bbox); - x0 = MIN (x000, x001); - x0 = MIN (x0, x011); - x0 = MIN (x0, x111); - y0 = MIN (y000, y001); - y0 = MIN (y0, y011); - y0 = MIN (y0, y111); - x1 = MAX (x000, x001); - x1 = MAX (x1, x011); - x1 = MAX (x1, x111); - y1 = MAX (y000, y001); - y1 = MAX (y1, y011); - y1 = MAX (y1, y111); + x0 = std::min (x000, x001); + x0 = std::min (x0, x011); + x0 = std::min (x0, x111); + 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); if (best) { /* Quickly adjust to endpoints */ |