From 1fd57a41383419cbeddbaef27e52d55c0d02400f Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Fri, 6 Jun 2014 17:01:38 -0400 Subject: Clean up some unnecessary pointer usage in livarot (bzr r13341.1.50) --- src/ui/tools/flood-tool.cpp | 2 +- src/ui/tools/pencil-tool.cpp | 5 ++--- src/ui/tools/tweak-tool.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/ui') diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp index d74848dc6..15bc7164c 100644 --- a/src/ui/tools/flood-tool.cpp +++ b/src/ui/tools/flood-tool.cpp @@ -408,7 +408,7 @@ static void do_trace(bitmap_coords_info bci, guchar *trace_px, SPDesktop *deskto Shape *path_shape = new Shape(); path->ConvertWithBackData(0.03); - path->Fill(path_shape, 0); + path->Fill(*path_shape, 0); delete path; Shape *expanded_path_shape = new Shape(); diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp index 0e8660248..48f8c3a28 100644 --- a/src/ui/tools/pencil-tool.cpp +++ b/src/ui/tools/pencil-tool.cpp @@ -760,9 +760,8 @@ void PencilTool::_sketchInterpolate() { path.LoadPathVector(Geom::path_from_piecewise(this->sketch_interpolation, 0.01)); path.Simplify(0.5); - Geom::PathVector *pathv = path.MakePathVector(); - this->sketch_interpolation = (*pathv)[0].toPwSb(); - delete pathv; + Geom::PathVector pathv = path.MakePathVector(); + this->sketch_interpolation = pathv[0].toPwSb(); } else { this->sketch_interpolation = fit_pwd2; } diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp index 75650d3af..bc1519773 100644 --- a/src/ui/tools/tweak-tool.cpp +++ b/src/ui/tools/tweak-tool.cpp @@ -551,7 +551,7 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P Geom::Affine i2doc(item->i2doc_affine()); orig->ConvertWithBackData((0.08 - (0.07 * fidelity)) / i2doc.descrim()); // default 0.059 - orig->Fill(theShape, 0); + orig->Fill(*theShape, 0); SPCSSAttr *css = sp_repr_css_attr(item->getRepr(), "style"); gchar const *val = sp_repr_css_property(css, "fill-rule", NULL); -- cgit v1.2.3