From 9c240dfd00dd067d2ddde8c6d46c212bd55d8c55 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Sun, 22 Jun 2008 22:28:03 +0000 Subject: read PathVector instead of NArtBpath (bzr r6022) --- src/sp-offset.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/sp-offset.cpp') diff --git a/src/sp-offset.cpp b/src/sp-offset.cpp index d3711a9f6..c11324ec5 100644 --- a/src/sp-offset.cpp +++ b/src/sp-offset.cpp @@ -39,6 +39,7 @@ #include "libnr/n-art-bpath.h" #include +#include <2geom/pathvector.h> #include "xml/repr.h" @@ -347,13 +348,11 @@ sp_offset_set(SPObject *object, unsigned key, gchar const *value) offset->original = NULL; offset->originalPath = NULL; } - NArtBpath *bpath; - SPCurve *curve; offset->original = strdup (value); - bpath = sp_svg_read_path (offset->original); - curve = SPCurve::new_from_bpath (bpath); // curve se chargera de detruire bpath + Geom::PathVector pv = sp_svg_read_pathv(offset->original); + SPCurve *curve = new SPCurve(pv); // fixme: translate this: curve se chargera de detruire bpath g_assert (curve != NULL); offset->originalPath = bpath_to_liv_path (SP_CURVE_BPATH(curve)); curve->unref(); @@ -531,8 +530,8 @@ sp_offset_set_shape(SPShape *shape) const char *res_d = SP_OBJECT(shape)->repr->attribute("inkscape:original"); if ( res_d ) { - NArtBpath *bpath = sp_svg_read_path (res_d); - SPCurve *c = SPCurve::new_from_bpath (bpath); + Geom::PathVector pv = sp_svg_read_pathv(res_d); + SPCurve *c = new SPCurve(pv); g_assert(c != NULL); sp_shape_set_curve_insync ((SPShape *) offset, c, TRUE); c->unref(); @@ -780,8 +779,8 @@ sp_offset_set_shape(SPShape *shape) } delete orig; - NArtBpath *bpath = sp_svg_read_path (res_d); - SPCurve *c = SPCurve::new_from_bpath (bpath); + Geom::PathVector pv = sp_svg_read_pathv(res_d); + SPCurve *c = new SPCurve(pv); g_assert(c != NULL); sp_shape_set_curve_insync ((SPShape *) offset, c, TRUE); c->unref(); -- cgit v1.2.3