don't call cairo_new_path in feed_pathvector_to_cairo (like the old feed_path_to_cairo didn't do)

(bzr r6311)

1 files changed, 4 insertions, 6 deletions

diff --git a/src/display/inkscape-cairo.cpp b/src/display/inkscape-cairo.cpp
index e41d93952..907f4c3ef 100644
--- a/src/display/inkscape-cairo.cpp
+++ b/src/display/inkscape-cairo.cpp
@@ -294,7 +294,8 @@ feed_path_to_cairo (cairo_t *ct, Geom::Path const &path, Geom::Matrix trans, NR:
     }
 }
 
-/** Feeds path-creating calls to the cairo context translating them from the PathVector, with the given transform and shift */
+/** Feeds path-creating calls to the cairo context translating them from the PathVector, with the given transform and shift
+ *  One must have done cairo_new_path(ct); before calling this function. */
 void
 feed_pathvector_to_cairo (cairo_t *ct, Geom::PathVector const &pathv, Geom::Matrix trans, NR::Maybe<NR::Rect> area, bool optimize_stroke, double stroke_width)
 {
@@ -303,22 +304,19 @@ feed_pathvector_to_cairo (cairo_t *ct, Geom::PathVector const &pathv, Geom::Matr
     if (pathv.empty())
         return;
 
-    cairo_new_path(ct);
-
     for(Geom::PathVector::const_iterator it = pathv.begin(); it != pathv.end(); ++it) {
         feed_path_to_cairo(ct, *it, trans, area, optimize_stroke, stroke_width);
     }
 }
 
-/** Feeds path-creating calls to the cairo context translating them from the PathVector */
+/** Feeds path-creating calls to the cairo context translating them from the PathVector
+ *  One must have done cairo_new_path(ct); before calling this function. */
 void
 feed_pathvector_to_cairo (cairo_t *ct, Geom::PathVector const &pathv)
 {
     if (pathv.empty())
         return;
 
-    cairo_new_path(ct);
-
     for(Geom::PathVector::const_iterator it = pathv.begin(); it != pathv.end(); ++it) {
         feed_path_to_cairo(ct, *it);
     }