From: johanengelen <johanengelen@users.sourceforge.net>
Date: Wed, 7 Nov 2007 23:49:18 +0000 (+0000)
Subject: update 2geom
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8e9ea25ef0d0f668ad77dae037269f19ba99143b;p=inkscape.git

update 2geom
---

diff --git a/src/2geom/piecewise.h b/src/2geom/piecewise.h
index 396811050..b4f000dc4 100644
--- a/src/2geom/piecewise.h
+++ b/src/2geom/piecewise.h
@@ -216,7 +216,7 @@ class Piecewise {
 template<typename T>
 inline typename FragmentConcept<T>::BoundsType bounds_fast(const Piecewise<T> &f) {
     boost::function_requires<FragmentConcept<T> >();
-
+    
     if(f.empty()) return typename FragmentConcept<T>::BoundsType();
     typename FragmentConcept<T>::BoundsType ret(bounds_fast(f[0]));
     for(unsigned i = 1; i < f.size(); i++)
@@ -227,7 +227,7 @@ inline typename FragmentConcept<T>::BoundsType bounds_fast(const Piecewise<T> &f
 template<typename T>
 inline typename FragmentConcept<T>::BoundsType bounds_exact(const Piecewise<T> &f) {
     boost::function_requires<FragmentConcept<T> >();
-
+    
     if(f.empty()) return typename FragmentConcept<T>::BoundsType();
     typename FragmentConcept<T>::BoundsType ret(bounds_exact(f[0]));
     for(unsigned i = 1; i < f.size(); i++)
@@ -238,20 +238,20 @@ inline typename FragmentConcept<T>::BoundsType bounds_exact(const Piecewise<T> &
 template<typename T>
 inline typename FragmentConcept<T>::BoundsType bounds_local(const Piecewise<T> &f, const Interval &m) {
     boost::function_requires<FragmentConcept<T> >();
-
+    
     if(f.empty()) return typename FragmentConcept<T>::BoundsType();
     if(m.isEmpty()) return typename FragmentConcept<T>::BoundsType(f(m.min()));
-
+    
     unsigned fi = f.segN(m.min()), ti = f.segN(m.max());
     double ft = f.segT(m.min(), fi), tt = f.segT(m.max(), ti);
-
+    
     if(fi == ti) return bounds_local(f[fi], Interval(ft, tt));
-
+    
     typename FragmentConcept<T>::BoundsType ret(bounds_local(f[fi], Interval(ft, 1.)));
     for(unsigned i = fi + 1; i < ti; i++)
         ret.unionWith(bounds_exact(f[i]));
     if(tt != 0.) ret.unionWith(bounds_local(f[ti], Interval(0., tt)));
-
+    
     return ret;
 }
 
diff --git a/src/2geom/rect.h b/src/2geom/rect.h
index 6a6d979a4..86f9ec140 100644
--- a/src/2geom/rect.h
+++ b/src/2geom/rect.h
@@ -54,9 +54,9 @@ template<>
 class D2<Interval> {
   private:
     Interval f[2];
-    D2<Interval>();// { f[X] = f[Y] = Interval(0, 0); }
-
   public:
+    D2<Interval>() { f[X] = f[Y] = Interval(0, 0); }
+    
     D2<Interval>(Interval const &a, Interval const &b) {
         f[X] = a;
         f[Y] = b;