read PathVector instead of NArtBpath

diff --git a/src/sp-offset.cpp b/src/sp-offset.cpp
index d3711a9f6d01e26d60c1d7de3643e3a8a4e9df47..c11324ec5f9c23da60f0d18e3c579512acef9070 100644 (file)
--- a/src/sp-offset.cpp
+++ b/src/sp-offset.cpp
@@ -39,6 +39,7 @@
 
 #include "libnr/n-art-bpath.h"
 #include <libnr/nr-matrix-fns.h>
+#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();

diff --git a/src/sp-path.cpp b/src/sp-path.cpp
index 16c8b85f40801d678d97f96e9cc2c6b7c38e231e..962be5cb50bb91a9d70287ec3545399c926dcf3b 100644 (file)
--- a/src/sp-path.cpp
+++ b/src/sp-path.cpp
@@ -24,6 +24,7 @@
 #include <libnr/n-art-bpath.h>
 #include <libnr/nr-path.h>
 #include <libnr/nr-matrix-fns.h>
+#include <2geom/pathvector.h>
 
 #include "svg/svg.h"
 #include "xml/repr.h"
@@ -247,8 +248,8 @@ sp_path_set(SPObject *object, unsigned int key, gchar const *value)
     switch (key) {
         case SP_ATTR_INKSCAPE_ORIGINAL_D:
                 if (value) {
-                    NArtBpath *bpath = sp_svg_read_path(value);
-                    SPCurve *curve = SPCurve::new_from_bpath(bpath);
+                    Geom::PathVector pv = sp_svg_read_pathv(value);
+                    SPCurve *curve = new SPCurve(pv);
                     if (curve) {
                         sp_path_set_original_curve(path, curve, TRUE, true);
                         curve->unref();
@@ -261,8 +262,8 @@ sp_path_set(SPObject *object, unsigned int key, gchar const *value)
        case SP_ATTR_D:
             if (!sp_lpe_item_has_path_effect_recursive(SP_LPE_ITEM(path))) {
                 if (value) {
-                    NArtBpath *bpath = sp_svg_read_path(value);
-                    SPCurve *curve = SPCurve::new_from_bpath(bpath);
+                    Geom::PathVector pv = sp_svg_read_pathv(value);
+                    SPCurve *curve = new SPCurve(pv);
                     if (curve) {
                         sp_shape_set_curve((SPShape *) path, curve, TRUE);
                         curve->unref();