Use subdirectories with icon sizes.

[inkscape.git] / src / libnr / nr-convex-hull.h

diff --git a/src/libnr/nr-convex-hull.h b/src/libnr/nr-convex-hull.h
index fef885f005ac862afc3c72672804667b7a80183d..dafdd8840bb69c7e7cf4b23ec652ff2f938888c6 100644 (file)
--- a/src/libnr/nr-convex-hull.h
+++ b/src/libnr/nr-convex-hull.h
@@ -17,49 +17,41 @@ namespace NR {
 
 class ConvexHull {
 public:
-       explicit ConvexHull(Point const &p)
-    : _initial(p) {}
+    ConvexHull() : _bounds() {}
+       explicit ConvexHull(Point const &p) : _bounds(Rect(p, p)) {}
 
-    Point midpoint() const {
+    boost::optional<Point> midpoint() const {
         if (_bounds) {
             return _bounds->midpoint();
         } else {
-            return _initial;
+            return boost::optional<Point>();
         }
     }
 
        void add(Point const &p) {
         if (_bounds) {
                    _bounds->expandTo(p);
-        } else if ( p != _initial ) {
-            _bounds = Rect(_initial, p);
+        } else {
+            _bounds = Rect(p, p);
         }
        }
-       void add(Rect const &p) {
+       void add(Rect const &r) {
                // Note that this is a hack.  when convexhull actually works
                // you will need to add all four points.
-               if (_bounds) {
-            _bounds = union_bounds(*_bounds, p);
-        } else {
-            _bounds = p;
-            _bounds->expandTo(_initial);
-        }
+        _bounds = union_bounds(_bounds, r);
        }
        void add(ConvexHull const &h) {
         if (h._bounds) {
             add(*h._bounds);
-        } else {
-            add(h._initial);
         }
        }
 
-       Maybe<Rect> const &bounds() const {
+       boost::optional<Rect> const &bounds() const {
                return _bounds;
        }
        
 private:
-    Point _initial;
-       Maybe<Rect> _bounds;
+    boost::optional<Rect> _bounds;
 };
 
 } /* namespace NR */