diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-07-11 16:28:14 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-07-11 16:28:14 +0000 |
| commit | 6bbb9c3c43d7fab9e54b6557c96999257a79b080 (patch) | |
| tree | 5311919e711475a37f61b2c2b0e5c61161d06c14 /src | |
| parent | partial update of 2geom (diff) | |
| download | inkscape-6bbb9c3c43d7fab9e54b6557c96999257a79b080.tar.gz inkscape-6bbb9c3c43d7fab9e54b6557c96999257a79b080.zip | |
use new 2geom function. This ensures we cannot end up in infinite loop while converting unexpected 2geom curve types to expected types.
(bzr r6260)
Diffstat (limited to 'src')
| -rw-r--r-- | src/display/inkscape-cairo.cpp | 2 | ||||
| -rw-r--r-- | src/helper/geom.cpp | 2 | ||||
| -rw-r--r-- | src/livarot/PathCutting.cpp | 2 | ||||
| -rw-r--r-- | 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) { |