From b4501ad5a552f01e37c9b4ada286e0c5508387bd Mon Sep 17 00:00:00 2001 From: johanengelen Date: Fri, 11 Jul 2008 16:28:14 +0000 Subject: [PATCH] use new 2geom function. This ensures we cannot end up in infinite loop while converting unexpected 2geom curve types to expected types. --- src/display/inkscape-cairo.cpp | 2 +- src/helper/geom.cpp | 2 +- src/livarot/PathCutting.cpp | 2 +- src/svg/svg-path.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/display/inkscape-cairo.cpp b/src/display/inkscape-cairo.cpp index b67ac1311..069727064 100644 --- a/src/display/inkscape-cairo.cpp +++ b/src/display/inkscape-cairo.cpp @@ -219,7 +219,7 @@ feed_curve_to_cairo(cairo_t *cr, Geom::Curve const &c, Geom::Matrix & trans, Geo // } else { //this case handles sbasis as well as all other curve types - Geom::Path sbasis_path = path_from_sbasis(c.toSBasis(), 0.1); + Geom::Path sbasis_path = Geom::cubicbezierpath_from_sbasis(c.toSBasis(), 0.1); //recurse to convert the new path resulting from the sbasis to svgd for(Geom::Path::iterator iter = sbasis_path.begin(); iter != sbasis_path.end(); ++iter) { diff --git a/src/helper/geom.cpp b/src/helper/geom.cpp index 34195be15..39dd2414a 100644 --- a/src/helper/geom.cpp +++ b/src/helper/geom.cpp @@ -395,7 +395,7 @@ geom_curve_bbox_wind_distance(Geom::Curve const & c, Geom::Matrix const &m, p0 = p3; } else { //this case handles sbasis as well as all other curve types - Geom::Path sbasis_path = Geom::path_from_sbasis(c.toSBasis(), 0.1); + Geom::Path sbasis_path = Geom::cubicbezierpath_from_sbasis(c.toSBasis(), 0.1); //recurse to convert the new path resulting from the sbasis to svgd for(Geom::Path::iterator iter = sbasis_path.begin(); iter != sbasis_path.end(); ++iter) { diff --git a/src/livarot/PathCutting.cpp b/src/livarot/PathCutting.cpp index 2c3240eba..5aa77c1e5 100644 --- a/src/livarot/PathCutting.cpp +++ b/src/livarot/PathCutting.cpp @@ -550,7 +550,7 @@ void Path::AddCurve(Geom::Curve const &c) svg_elliptical_arc->large_arc_flag(), svg_elliptical_arc->sweep_flag() ); } else { //this case handles sbasis as well as all other curve types - Geom::Path sbasis_path = Geom::path_from_sbasis(c.toSBasis(), 0.1); + Geom::Path sbasis_path = Geom::cubicbezierpath_from_sbasis(c.toSBasis(), 0.1); //recurse to convert the new path resulting from the sbasis to svgd for(Geom::Path::iterator iter = sbasis_path.begin(); iter != sbasis_path.end(); ++iter) { diff --git a/src/svg/svg-path.cpp b/src/svg/svg-path.cpp index 9c305eebe..1ab70d101 100644 --- a/src/svg/svg-path.cpp +++ b/src/svg/svg-path.cpp @@ -760,7 +760,7 @@ static void sp_svg_write_curve(Inkscape::SVG::PathString & str, Geom::Curve cons str.verticalLineTo( ... ); */ } else { //this case handles sbasis as well as all other curve types - Geom::Path sbasis_path = Geom::path_from_sbasis(c->toSBasis(), 0.1); + Geom::Path sbasis_path = Geom::cubicbezierpath_from_sbasis(c->toSBasis(), 0.1); //recurse to convert the new path resulting from the sbasis to svgd for(Geom::Path::iterator iter = sbasis_path.begin(); iter != sbasis_path.end(); ++iter) { -- 2.30.2