partial update of 2geom

diff --git a/src/2geom/sbasis-to-bezier.cpp b/src/2geom/sbasis-to-bezier.cpp
index cca30291d4f1eb4e1a9f238af82998b0b4c746a0..a046d7dbe04e98577e6b9819a9c6663937933ff9 100644 (file)
--- a/src/2geom/sbasis-to-bezier.cpp
+++ b/src/2geom/sbasis-to-bezier.cpp
@@ -179,35 +179,44 @@ subpath_from_sbasis_incremental(Geom::OldPathSetBuilder &pb, D2<SBasis> B, doubl
 
 #endif
 
-void build_from_sbasis(Geom::PathBuilder &pb, D2<SBasis> const &B, double tol) {
+/*
+ * If only_cubicbeziers is true, the resulting path may only contain CubicBezier curves.
+ */
+void build_from_sbasis(Geom::PathBuilder &pb, D2<SBasis> const &B, double tol, bool only_cubicbeziers) {
     if (!B.isFinite()) {
         THROW_EXCEPTION("assertion failed: B.isFinite()");
     }
     if(tail_error(B, 2) < tol || sbasis_size(B) == 2) { // nearly cubic enough
-        if(sbasis_size(B) <= 1) {
+        if( !only_cubicbeziers && (sbasis_size(B) <= 1) ) {
             pb.lineTo(B.at1());
         } else {
             std::vector<Geom::Point> bez = sbasis_to_bezier(B, 2);
             pb.curveTo(bez[1], bez[2], bez[3]);
         }
     } else {
-        build_from_sbasis(pb, compose(B, Linear(0, 0.5)), tol);
-        build_from_sbasis(pb, compose(B, Linear(0.5, 1)), tol);
+        build_from_sbasis(pb, compose(B, Linear(0, 0.5)), tol, only_cubicbeziers);
+        build_from_sbasis(pb, compose(B, Linear(0.5, 1)), tol, only_cubicbeziers);
     }
 }
 
+/*
+ * If only_cubicbeziers is true, the resulting path may only contain CubicBezier curves.
+ */
 Path
-path_from_sbasis(D2<SBasis> const &B, double tol) {
+path_from_sbasis(D2<SBasis> const &B, double tol, bool only_cubicbeziers) {
     PathBuilder pb;
     pb.moveTo(B.at0());
-    build_from_sbasis(pb, B, tol);
+    build_from_sbasis(pb, B, tol, only_cubicbeziers);
     pb.finish();
     return pb.peek().front();
 }
 
+/*
+ * If only_cubicbeziers is true, the resulting path may only contain CubicBezier curves.
+ */
 //TODO: some of this logic should be lifted into svg-path
 std::vector<Geom::Path>
-path_from_piecewise(Geom::Piecewise<Geom::D2<Geom::SBasis> > const &B, double tol) {
+path_from_piecewise(Geom::Piecewise<Geom::D2<Geom::SBasis> > const &B, double tol, bool only_cubicbeziers) {
     Geom::PathBuilder pb;
     if(B.size() == 0) return pb.peek();
     Geom::Point start = B[0].at0();
@@ -219,7 +228,7 @@ path_from_piecewise(Geom::Piecewise<Geom::D2<Geom::SBasis> > const &B, double to
                 //last line seg already there
                 goto no_add;
             }
-            build_from_sbasis(pb, B[i], tol);
+            build_from_sbasis(pb, B[i], tol, only_cubicbeziers);
             if(are_near(start, B[i].at1())) {
                 //it's closed
                 pb.closePath();
@@ -229,7 +238,7 @@ path_from_piecewise(Geom::Piecewise<Geom::D2<Geom::SBasis> > const &B, double to
             start = B[i+1].at0();
             pb.moveTo(start);
         } else {
-            build_from_sbasis(pb, B[i], tol);
+            build_from_sbasis(pb, B[i], tol, only_cubicbeziers);
         }
     }
     pb.finish();

diff --git a/src/2geom/sbasis-to-bezier.h b/src/2geom/sbasis-to-bezier.h
index 046e8299660748f7fe46a86bc7169b62af47cd0f..2fedb83c74ccd3c418ae570beb62399b08525ed1 100644 (file)
--- a/src/2geom/sbasis-to-bezier.h
+++ b/src/2geom/sbasis-to-bezier.h
@@ -16,9 +16,11 @@ SBasis bezier_to_sbasis(Bezier const &B);
 std::vector<Geom::Point>
 sbasis_to_bezier(D2<SBasis> const &B, unsigned q = 0);
 
-std::vector<Path> path_from_piecewise(Piecewise<D2<SBasis> > const &B, double tol);
+std::vector<Path> path_from_piecewise(Piecewise<D2<SBasis> > const &B, double tol, bool only_cubicbeziers = false);
 
-Path path_from_sbasis(D2<SBasis> const &B, double tol);
+Path path_from_sbasis(D2<SBasis> const &B, double tol, bool only_cubicbeziers = false);
+inline Path cubicbezierpath_from_sbasis(D2<SBasis> const &B, double tol)
+    { return path_from_sbasis(B, tol, true); } ;
 
 };
 #endif