Replace direct use of Cairo contexts and surfaces in the rendering tree

with wrappers which keep some extra information about the surface,
amd NRRect and NRRectL use with Geom::Rect and Geom::IntRect.
Should simplify implementing filter primitive subregions.

(bzr r10347.1.17)

1 files changed, 14 insertions, 1 deletions

diff --git a/src/2geom/interval.h b/src/2geom/interval.h
index ee6d674d2..e95da4811 100644
--- a/src/2geom/interval.h
+++ b/src/2geom/interval.h
@@ -64,7 +64,7 @@ typedef GenericOptInterval<Coord> OptInterval;
 class Interval
     : public GenericInterval<Coord>
     , boost::multipliable< Interval
-    , boost::multipliable< Interval, Coord
+    , boost::multiplicative< Interval, Coord
       > >
 {
     typedef GenericInterval<Coord> Base;
@@ -180,7 +180,20 @@ public:
     /// @}
 };
 
+// functions required for Python bindings
+inline Interval unify(Interval const &a, Interval const &b)
+{
+    Interval r = a | b;
+    return r;
+}
+inline OptInterval intersect(Interval const &a, Interval const &b)
+{
+    OptInterval r = a & b;
+    return r;
 }
+
+} // end namespace Geom
+
 #endif //SEEN_INTERVAL_H
 
 /*