diff --git a/include/mapnik/renderer_common/process_building_symbolizer.hpp b/include/mapnik/renderer_common/process_building_symbolizer.hpp index a9c88436b..d65df2544 100644 --- a/include/mapnik/renderer_common/process_building_symbolizer.hpp +++ b/include/mapnik/renderer_common/process_building_symbolizer.hpp @@ -38,8 +38,8 @@ namespace detail { template void make_building(geometry::polygon const& poly, double height, F1 const& face_func, F2 const& frame_func, F3 const& roof_func) { - const std::unique_ptr frame(new path_type(path_type::types::LineString)); - const std::unique_ptr roof(new path_type(path_type::types::Polygon)); + path_type frame(path_type::types::LineString); + path_type roof(path_type::types::Polygon); std::deque face_segments; double ring_begin_x, ring_begin_y; double x0 = 0; @@ -52,18 +52,18 @@ void make_building(geometry::polygon const& poly, double height, F1 cons { if (cm == SEG_MOVETO) { - frame->move_to(x,y); + frame.move_to(x,y); ring_begin_x = x; ring_begin_y = y; } else if (cm == SEG_LINETO) { - frame->line_to(x,y); + frame.line_to(x,y); face_segments.emplace_back(x0,y0,x,y); } else if (cm == SEG_CLOSE) { - frame->close_path(); + frame.close_path(); if (!face_segments.empty()) { face_segments.emplace_back(x0, y0, ring_begin_x, ring_begin_y); @@ -76,16 +76,16 @@ void make_building(geometry::polygon const& poly, double height, F1 cons std::sort(face_segments.begin(),face_segments.end(), y_order); for (auto const& seg : face_segments) { - const std::unique_ptr faces(new path_type(path_type::types::Polygon)); - faces->move_to(std::get<0>(seg),std::get<1>(seg)); - faces->line_to(std::get<2>(seg),std::get<3>(seg)); - faces->line_to(std::get<2>(seg),std::get<3>(seg) + height); - faces->line_to(std::get<0>(seg),std::get<1>(seg) + height); + path_type faces(path_type::types::Polygon); + faces.move_to(std::get<0>(seg),std::get<1>(seg)); + faces.line_to(std::get<2>(seg),std::get<3>(seg)); + faces.line_to(std::get<2>(seg),std::get<3>(seg) + height); + faces.line_to(std::get<0>(seg),std::get<1>(seg) + height); - face_func(*faces); + face_func(faces); // - frame->move_to(std::get<0>(seg),std::get<1>(seg)); - frame->line_to(std::get<0>(seg),std::get<1>(seg)+height); + frame.move_to(std::get<0>(seg),std::get<1>(seg)); + frame.line_to(std::get<0>(seg),std::get<1>(seg)+height); } va.rewind(0); @@ -94,23 +94,23 @@ void make_building(geometry::polygon const& poly, double height, F1 cons { if (cm == SEG_MOVETO) { - frame->move_to(x,y+height); - roof->move_to(x,y+height); + frame.move_to(x,y+height); + roof.move_to(x,y+height); } else if (cm == SEG_LINETO) { - frame->line_to(x,y+height); - roof->line_to(x,y+height); + frame.line_to(x,y+height); + roof.line_to(x,y+height); } else if (cm == SEG_CLOSE) { - frame->close_path(); - roof->close_path(); + frame.close_path(); + roof.close_path(); } } - frame_func(*frame); - roof_func(*roof); + frame_func(frame); + roof_func(roof); } } // ns detail