change some SP_CURVE_BPATH to get_bpath

diff --git a/src/display/curve.cpp b/src/display/curve.cpp
index 4276627b4ae99ccd72bfc41ec45cf0a76db7eb7d..035b65fd7d622b16c034b9b47f155c9acb5f4be9 100644 (file)
--- a/src/display/curve.cpp
+++ b/src/display/curve.cpp
@@ -5,8 +5,9 @@
  */
 
 /*
- * Author:
+ * Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
+ *   Johan Engelen
  *
  * Copyright (C) 2000 Lauris Kaplinski
  * Copyright (C) 2000-2001 Ximian, Inc.

diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index 33242b09e0c405cffba7d1655c9adac9d5d77377..4efebdafd2387bfbd472924e4e3eb7ac0f300094 100644 (file)
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -2050,7 +2050,7 @@ bool OdfOutput::writeTree(Writer &couts, Writer &souts,
                        bbox_width * 1000.0, bbox_height * 1000.0);
 
         couts.printf("    svg:d=\"");
-        int nrPoints = writePath(couts, SP_CURVE_BPATH(curve),
+        int nrPoints = writePath(couts, curve->get_bpath(),
                              tf, bbox_x, bbox_y);
         couts.printf("\"");
 

diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp
index 8d701b28eb925ac3e2540c05f46c13d9d9ce11ed..bfbb0e4d40abd5698987427784913c67a5287a8f 100644 (file)
--- a/src/extension/internal/pov-out.cpp
+++ b/src/extension/internal/pov-out.cpp
@@ -331,7 +331,7 @@ void PovOutput::doCurves(SPDocument *doc)
 
         //Count the NR_CURVETOs/LINETOs
         int segmentCount=0;
-        NArtBpath const *bp = SP_CURVE_BPATH(curve);
+        NArtBpath const *bp = curve->get_bpath();
         for (int curveNr=0 ; curveNr<curveLength ; curveNr++, bp++)
             if (bp->code == NR_CURVETO || bp->code == NR_LINETO)
                 segmentCount++;
@@ -353,7 +353,7 @@ void PovOutput::doCurves(SPDocument *doc)
         out("    0.0, //bottom\n");
         out("    %d //nr points\n", segmentCount * 4);
         int segmentNr = 0;
-        bp = SP_CURVE_BPATH(curve);
+        bp = curve->get_bpath();
         
         nrSegments += curveLength;
 

diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index 5868140a6d25b101fe677b514e1c2cd51b84da8b..944c15f842b11942e61e3f441cdd8e509732fb34 100644 (file)
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -826,7 +826,7 @@ sp_selected_path_outline()
 
                 SPShape *shape = SP_SHAPE(item);
 
-                for (NArtBpath const* bp = SP_CURVE_BPATH(shape->curve); bp->code != NR_END; bp++) {
+                for (NArtBpath const* bp = curve->get_bpath(); bp->code != NR_END; bp++) {
                     for (int m = SP_MARKER_LOC_START; m < SP_MARKER_LOC_QTY; m++) {
                         if (sp_shape_marker_required (shape, m, bp)) {