From 8e34077aef10774ba1723310d3e33b58f77c750d Mon Sep 17 00:00:00 2001 From: artemp Date: Wed, 18 Feb 2015 13:51:20 +0100 Subject: [PATCH] more cleanups --- plugins/input/shape/shape_featureset.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/plugins/input/shape/shape_featureset.cpp b/plugins/input/shape/shape_featureset.cpp index 8ede9bb89..84ce00edf 100644 --- a/plugins/input/shape/shape_featureset.cpp +++ b/plugins/input/shape/shape_featureset.cpp @@ -102,18 +102,15 @@ feature_ptr shape_featureset::next() shape_io::read_bbox(record, feature_bbox_); if (!filter_.pass(feature_bbox_)) continue; int num_points = record.read_ndr_integer(); - mapnik::new_geometry::multi_point multi_pt; + mapnik::new_geometry::multi_point multi_point; for (int i = 0; i < num_points; ++i) { double x = record.read_double(); double y = record.read_double(); - mapnik::new_geometry::point pt(x, y); - //std::unique_ptr point(new geometry_type(mapnik::geometry_type::types::Point)); - //point->move_to(x, y); - //feature->paths().push_back(point.release()); - multi_pt.push_back(std::move(pt)); + mapnik::new_geometry::point point(x, y); + multi_point.push_back(std::move(point)); } - feature->set_geometry(std::move(multi_pt)); + feature->set_geometry(std::move(multi_point)); break; }