Merge from trunk.

[inkscape.git] / src / splivarot.h

diff --git a/src/splivarot.h b/src/splivarot.h
index 755beaa800d412c7880e31e2e5e9d6eb159a7bb3..d85ae030acd13398bd40091fb046aaccbf381558 100644 (file)
--- a/src/splivarot.h
+++ b/src/splivarot.h
@@ -43,6 +43,7 @@ void sp_selected_path_create_updating_offset_object_zero (SPDesktop *desktop);
 // outline of a curve
 // uses the stroke-width
 void sp_selected_path_outline (SPDesktop *desktop);
+Geom::PathVector* item_outline(SPItem const *item);
 
 // simplifies a path (removes small segments and the like)
 void sp_selected_path_simplify (SPDesktop *desktop);
@@ -50,9 +51,8 @@ void sp_selected_path_simplify (SPDesktop *desktop);
 Path *Path_for_item(SPItem *item, bool doTransformation, bool transformFull = true);
 Geom::PathVector* pathvector_for_curve(SPItem *item, SPCurve *curve, bool doTransformation, bool transformFull, Geom::Matrix extraPreAffine, Geom::Matrix extraPostAffine);
 SPCurve *curve_for_item(SPItem *item);
-boost::optional<Path::cut_position> get_nearest_position_on_Path(Path *path, NR::Point p, unsigned seg = 0);
-NR::Point get_point_on_Path(Path *path, int piece, double t);
-Path *bpath_to_Path(NArtBpath const *bpath);
+boost::optional<Path::cut_position> get_nearest_position_on_Path(Path *path, Geom::Point p, unsigned seg = 0);
+Geom::Point get_point_on_Path(Path *path, int piece, double t);
 
 #endif
 
@@ -65,4 +65,4 @@ Path *bpath_to_Path(NArtBpath const *bpath);
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :