diff --git a/src/display/curve.h b/src/display/curve.h
index d637961405273c84737979a45478578dccb1cef7..5be8f5a4e48497157556b898acfc9489cca97e34 100644 (file)
--- a/src/display/curve.h
+++ b/src/display/curve.h
/// Wrapper around NArtBpath.
struct SPCurve {
gint refcount;
/// Wrapper around NArtBpath.
struct SPCurve {
gint refcount;
- NArtBpath *bpath;
+ NArtBpath *_bpath;
/// Index in bpath[] of NR_END element.
gint end;
/// Index in bpath[] of NR_END element.
gint end;
/// (first subitem of the item about zero-length path segments)
NR::Point movePos;
/// (first subitem of the item about zero-length path segments)
NR::Point movePos;
- /// True iff bpath points to read-only, static storage (see callers of
- /// sp_curve_new_from_static_bpath), in which case we shouldn't free
- /// bpath and shouldn't write through it.
- bool sbpath : 1;
-
/// True iff current point is defined. Initially false for a new curve;
/// becomes true after moveto; becomes false on closepath. Curveto,
/// lineto etc. require hascpt; hascpt remains true after lineto/curveto.
/// True iff current point is defined. Initially false for a new curve;
/// becomes true after moveto; becomes false on closepath. Curveto,
/// lineto etc. require hascpt; hascpt remains true after lineto/curveto.
};
#define SP_CURVE_LENGTH(c) (((SPCurve const *)(c))->end)
};
#define SP_CURVE_LENGTH(c) (((SPCurve const *)(c))->end)
-#define SP_CURVE_BPATH(c) (((SPCurve const *)(c))->bpath)
-#define SP_CURVE_SEGMENT(c,i) (((SPCurve const *)(c))->bpath + (i))
+#define SP_CURVE_BPATH(c) (((SPCurve const *)(c))->_bpath)
+#define SP_CURVE_SEGMENT(c,i) (((SPCurve const *)(c))->_bpath + (i))
/* Constructors */
SPCurve *sp_curve_new();
SPCurve *sp_curve_new_sized(gint length);
SPCurve *sp_curve_new_from_bpath(NArtBpath *bpath);
/* Constructors */
SPCurve *sp_curve_new();
SPCurve *sp_curve_new_sized(gint length);
SPCurve *sp_curve_new_from_bpath(NArtBpath *bpath);
-SPCurve *sp_curve_new_from_static_bpath(NArtBpath const *bpath);
SPCurve *sp_curve_new_from_foreign_bpath(NArtBpath const bpath[]);
SPCurve *sp_curve_ref(SPCurve *curve);
SPCurve *sp_curve_new_from_foreign_bpath(NArtBpath const bpath[]);
SPCurve *sp_curve_ref(SPCurve *curve);