diff --git a/demo/c++/rundemo.cpp b/demo/c++/rundemo.cpp index 67e3fd175..242a5102d 100644 --- a/demo/c++/rundemo.cpp +++ b/demo/c++/rundemo.cpp @@ -45,7 +45,7 @@ #include -int main ( int argc , char** argv) +int main ( int, char** ) { using namespace mapnik; const std::string srs_lcc="+proj=lcc +ellps=GRS80 +lat_0=49 +lon_0=-95 +lat+1=49 +lat_2=77 \ diff --git a/deps/agg/include/agg_scanline_bin.h b/deps/agg/include/agg_scanline_bin.h index 660292b61..6f9f41e8e 100644 --- a/deps/agg/include/agg_scanline_bin.h +++ b/deps/agg/include/agg_scanline_bin.h @@ -186,7 +186,7 @@ namespace agg scanline32_bin() : m_max_len(0), m_last_x(0x7FFFFFF0) {} //-------------------------------------------------------------------- - void reset(int min_x, int max_x) + void reset(int, int) { m_last_x = 0x7FFFFFF0; m_spans.remove_all(); diff --git a/include/mapnik/grid/grid_marker_helpers.hpp b/include/mapnik/grid/grid_marker_helpers.hpp index 9664669fe..595b7049c 100644 --- a/include/mapnik/grid/grid_marker_helpers.hpp +++ b/include/mapnik/grid/grid_marker_helpers.hpp @@ -163,7 +163,7 @@ struct vector_markers_rasterizer_dispatch_grid : mapnik::noncopyable double scale_factor, mapnik::feature_impl const& feature, attributes const& vars, - bool snap_to_pixels, + bool /*snap_to_pixels*/, RendererContext const& renderer_context) : buf_(std::get<0>(renderer_context)), pixf_(buf_), diff --git a/include/mapnik/json/geometry_generator_grammar.hpp b/include/mapnik/json/geometry_generator_grammar.hpp index 543dc64d1..befb80391 100644 --- a/include/mapnik/json/geometry_generator_grammar.hpp +++ b/include/mapnik/json/geometry_generator_grammar.hpp @@ -112,7 +112,7 @@ template struct json_coordinate_policy : karma::real_policies { using base_type = boost::spirit::karma::real_policies; - static int floatfield(T n) { return base_type::fmtflags::fixed; } + static int floatfield(T) { return base_type::fmtflags::fixed; } static unsigned precision(T n) { diff --git a/include/mapnik/params_impl.hpp b/include/mapnik/params_impl.hpp index 7685d00f4..1362f228d 100644 --- a/include/mapnik/params_impl.hpp +++ b/include/mapnik/params_impl.hpp @@ -94,7 +94,7 @@ struct extract_value template <> struct extract_value { - static inline boost::optional do_extract_from_string(std::string const& source) + static inline boost::optional do_extract_from_string(std::string const&) { return boost::optional(); // FIXME } diff --git a/include/mapnik/svg/geometry_svg_generator.hpp b/include/mapnik/svg/geometry_svg_generator.hpp index e0c40bbff..e3061d29e 100644 --- a/include/mapnik/svg/geometry_svg_generator.hpp +++ b/include/mapnik/svg/geometry_svg_generator.hpp @@ -123,8 +123,8 @@ namespace mapnik { namespace svg { struct coordinate_policy : karma::real_policies { using base_type = boost::spirit::karma::real_policies; - static int floatfield(T n) { return base_type::fmtflags::fixed; } - static unsigned precision(T n) { return 4u ;} + static int floatfield(T) { return base_type::fmtflags::fixed; } + static unsigned precision(T) { return 4u ;} }; } diff --git a/include/mapnik/svg/output/svg_renderer.hpp b/include/mapnik/svg/output/svg_renderer.hpp index d501de73c..1784d4214 100644 --- a/include/mapnik/svg/output/svg_renderer.hpp +++ b/include/mapnik/svg/output/svg_renderer.hpp @@ -82,42 +82,43 @@ public: /*! * @brief Overloads that process each kind of symbolizer individually. */ - void process(point_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans); void process(line_symbolizer const& sym, mapnik::feature_impl & feature, proj_transform const& prj_trans); - void process(line_pattern_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans); void process(polygon_symbolizer const& sym, mapnik::feature_impl & feature, proj_transform const& prj_trans); - void process(polygon_pattern_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans); - void process(raster_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans); - void process(shield_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans); - void process(text_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans); - void process(building_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans); - void process(markers_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans); - void process(debug_symbolizer const& /*sym*/, - mapnik::feature_impl & /*feature*/, - proj_transform const& /*prj_trans*/) {} - void process(group_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans); + // unimplemented + void process(point_symbolizer const&, + mapnik::feature_impl &, + proj_transform const&) {} + void process(line_pattern_symbolizer const&, + mapnik::feature_impl &, + proj_transform const&) {} + void process(polygon_pattern_symbolizer const&, + mapnik::feature_impl &, + proj_transform const&) {} + void process(raster_symbolizer const&, + mapnik::feature_impl &, + proj_transform const&) {} + void process(shield_symbolizer const&, + mapnik::feature_impl &, + proj_transform const&) {} + void process(text_symbolizer const&, + mapnik::feature_impl &, + proj_transform const&) {} + void process(building_symbolizer const&, + mapnik::feature_impl &, + proj_transform const&) {} + void process(markers_symbolizer const&, + mapnik::feature_impl &, + proj_transform const&) {} + void process(debug_symbolizer const&, + mapnik::feature_impl &, + proj_transform const&) {} + void process(group_symbolizer const&, + mapnik::feature_impl &, + proj_transform const&) {} // Overload that process the whole set of symbolizers of a rule. // return true, meaning that this renderer can process multiple symbolizers. diff --git a/include/mapnik/symbolizer_hash.hpp b/include/mapnik/symbolizer_hash.hpp index fbe551078..18f0a68d3 100644 --- a/include/mapnik/symbolizer_hash.hpp +++ b/include/mapnik/symbolizer_hash.hpp @@ -40,22 +40,22 @@ struct property_value_hash_visitor : util::static_visitor return val.rgba(); } - std::size_t operator() (font_feature_settings const& val) const + std::size_t operator() (font_feature_settings const&) const { return 0; //FIXME } - std::size_t operator() (transform_type const& val) const + std::size_t operator() (transform_type const&) const { return 0; //FIXME } - std::size_t operator() (enumeration_wrapper const& val) const + std::size_t operator() (enumeration_wrapper const&) const { return 0; //FIXME } - std::size_t operator() (dash_array const& val) const + std::size_t operator() (dash_array const&) const { return 0; //FIXME } diff --git a/include/mapnik/symbolizer_utils.hpp b/include/mapnik/symbolizer_utils.hpp index 614c936e9..17fb3a320 100644 --- a/include/mapnik/symbolizer_utils.hpp +++ b/include/mapnik/symbolizer_utils.hpp @@ -262,7 +262,7 @@ namespace { template struct set_property_impl { - static void apply(Symbolizer & sym, mapnik::keys key, std::string const& val) + static void apply(Symbolizer &, mapnik::keys, std::string const&) { std::cerr << "do nothing" << std::endl; } @@ -280,7 +280,7 @@ struct set_property_impl struct set_property_impl > { - static void apply(Symbolizer & sym, mapnik::keys key, std::string const& val) + static void apply(Symbolizer &, mapnik::keys, std::string const&) { std::cerr << " expects double" << std::endl; } @@ -289,7 +289,7 @@ struct set_property_impl struct set_property_impl > { - static void apply(Symbolizer & sym, mapnik::keys key, std::string const& val) + static void apply(Symbolizer &, mapnik::keys, std::string const&) { std::cerr << " expects bool" << std::endl; } diff --git a/include/mapnik/wkt/wkt_generator_grammar.hpp b/include/mapnik/wkt/wkt_generator_grammar.hpp index 616ed05b0..9c6337c25 100644 --- a/include/mapnik/wkt/wkt_generator_grammar.hpp +++ b/include/mapnik/wkt/wkt_generator_grammar.hpp @@ -122,7 +122,7 @@ template struct wkt_coordinate_policy : karma::real_policies { using base_type = boost::spirit::karma::real_policies; - static int floatfield(T n) { return base_type::fmtflags::fixed; } + static int floatfield(T) { return base_type::fmtflags::fixed; } static unsigned precision(T n) { if (n == 0.0) return 0; diff --git a/plugins/input/topojson/topojson_datasource.cpp b/plugins/input/topojson/topojson_datasource.cpp index 1109d4f9c..8e92245f5 100644 --- a/plugins/input/topojson/topojson_datasource.cpp +++ b/plugins/input/topojson/topojson_datasource.cpp @@ -120,7 +120,7 @@ struct collect_attributes_visitor : public mapnik::util::static_visitor collect_attributes_visitor(mapnik::layer_descriptor & desc): desc_(desc) {} - void operator() (mapnik::topojson::invalid const& g) {} + void operator() (mapnik::topojson::invalid const&) {} template void operator() (GeomType const& g) diff --git a/src/build.py b/src/build.py index 466cf6b80..4b1932833 100644 --- a/src/build.py +++ b/src/build.py @@ -354,17 +354,8 @@ if env['SVG_RENDERER']: # svg backend svg/output/svg_generator.cpp svg/output/svg_output_attributes.cpp svg/output/process_symbolizers.cpp - svg/output/process_building_symbolizer.cpp - svg/output/process_line_pattern_symbolizer.cpp svg/output/process_line_symbolizer.cpp - svg/output/process_markers_symbolizer.cpp - svg/output/process_point_symbolizer.cpp - svg/output/process_polygon_pattern_symbolizer.cpp svg/output/process_polygon_symbolizer.cpp - svg/output/process_raster_symbolizer.cpp - svg/output/process_shield_symbolizer.cpp - svg/output/process_text_symbolizer.cpp - svg/output/process_group_symbolizer.cpp """) lib_env.Append(CPPDEFINES = '-DSVG_RENDERER') libmapnik_defines.append('-DSVG_RENDERER') diff --git a/src/grid/process_raster_symbolizer.cpp b/src/grid/process_raster_symbolizer.cpp index 9bc262f58..b22947259 100644 --- a/src/grid/process_raster_symbolizer.cpp +++ b/src/grid/process_raster_symbolizer.cpp @@ -31,9 +31,9 @@ namespace mapnik { template -void grid_renderer::process(raster_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans) +void grid_renderer::process(raster_symbolizer const&, + mapnik::feature_impl &, + proj_transform const&) { MAPNIK_LOG_WARN(grid_renderer) << "grid_renderer: raster_symbolizer is not yet supported"; } diff --git a/src/rapidxml_loader.cpp b/src/rapidxml_loader.cpp index 51c153d75..ea2479378 100644 --- a/src/rapidxml_loader.cpp +++ b/src/rapidxml_loader.cpp @@ -39,20 +39,16 @@ #include namespace rapidxml = boost::property_tree::detail::rapidxml; + namespace mapnik { class rapidxml_loader : mapnik::noncopyable { public: - rapidxml_loader(const char *encoding = nullptr) : - filename_() - { + rapidxml_loader() : + filename_() {} - } - - ~rapidxml_loader() - { - } + ~rapidxml_loader() {} void load(std::string const& filename, xml_node & node) { diff --git a/src/svg/output/process_building_symbolizer.cpp b/src/svg/output/process_building_symbolizer.cpp deleted file mode 100644 index c0ff9f423..000000000 --- a/src/svg/output/process_building_symbolizer.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/***************************************************************************** - * - * This file is part of Mapnik (c++ mapping toolkit) - * - * Copyright (C) 2011 Artem Pavlenko - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - *****************************************************************************/ - -#if defined(SVG_RENDERER) - -// mapnik -#include - -namespace mapnik -{ -template -void svg_renderer::process(building_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans) -{ - // nothing yet. -} - -template void svg_renderer >::process(building_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans); -} - -#endif diff --git a/src/svg/output/process_group_symbolizer.cpp b/src/svg/output/process_group_symbolizer.cpp deleted file mode 100644 index ed7f71261..000000000 --- a/src/svg/output/process_group_symbolizer.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/***************************************************************************** - * - * This file is part of Mapnik (c++ mapping toolkit) - * - * Copyright (C) 2013 Artem Pavlenko - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - *****************************************************************************/ - -// mapnik -#include - -namespace mapnik -{ -template -void svg_renderer::process(group_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans) -{ - // nothing yet. -} - -template void svg_renderer >::process(group_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans); -} diff --git a/src/svg/output/process_line_pattern_symbolizer.cpp b/src/svg/output/process_line_pattern_symbolizer.cpp deleted file mode 100644 index e41c996d8..000000000 --- a/src/svg/output/process_line_pattern_symbolizer.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/***************************************************************************** - * - * This file is part of Mapnik (c++ mapping toolkit) - * - * Copyright (C) 2011 Artem Pavlenko - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - *****************************************************************************/ - -#if defined(SVG_RENDERER) - -// mapnik -#include - -namespace mapnik -{ -template -void svg_renderer::process(line_pattern_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans) -{ - // nothing yet. -} - -template void svg_renderer >::process(line_pattern_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans); -} - -#endif diff --git a/src/svg/output/process_markers_symbolizer.cpp b/src/svg/output/process_markers_symbolizer.cpp deleted file mode 100644 index 7f97c52e0..000000000 --- a/src/svg/output/process_markers_symbolizer.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/***************************************************************************** - * - * This file is part of Mapnik (c++ mapping toolkit) - * - * Copyright (C) 2011 Artem Pavlenko - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - *****************************************************************************/ - -#if defined(SVG_RENDERER) - -// mapnik -#include - -namespace mapnik -{ -template -void svg_renderer::process(markers_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans) -{ - // nothing yet. -} - -template void svg_renderer >::process(markers_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans); -} - -#endif diff --git a/src/svg/output/process_point_symbolizer.cpp b/src/svg/output/process_point_symbolizer.cpp deleted file mode 100644 index bde46cdd7..000000000 --- a/src/svg/output/process_point_symbolizer.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/***************************************************************************** - * - * This file is part of Mapnik (c++ mapping toolkit) - * - * Copyright (C) 2011 Artem Pavlenko - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - *****************************************************************************/ - -#if defined(SVG_RENDERER) - -// mapnik -#include - -namespace mapnik -{ -template -void svg_renderer::process(point_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans) -{ - // nothing yet. -} - -template void svg_renderer >::process(point_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans); -} - -#endif diff --git a/src/svg/output/process_polygon_pattern_symbolizer.cpp b/src/svg/output/process_polygon_pattern_symbolizer.cpp deleted file mode 100644 index c64a07b7d..000000000 --- a/src/svg/output/process_polygon_pattern_symbolizer.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/***************************************************************************** - * - * This file is part of Mapnik (c++ mapping toolkit) - * - * Copyright (C) 2011 Artem Pavlenko - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - *****************************************************************************/ - -#if defined(SVG_RENDERER) - -// mapnik -#include - -namespace mapnik -{ -template -void svg_renderer::process(polygon_pattern_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans) -{ - // nothing yet. -} - -template void svg_renderer >::process(polygon_pattern_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans); -} - -#endif diff --git a/src/svg/output/process_polygon_symbolizer.cpp b/src/svg/output/process_polygon_symbolizer.cpp index 3bcb345a5..77d8d5e05 100644 --- a/src/svg/output/process_polygon_symbolizer.cpp +++ b/src/svg/output/process_polygon_symbolizer.cpp @@ -34,7 +34,7 @@ namespace mapnik */ template void svg_renderer::process(polygon_symbolizer const& sym, - mapnik::feature_impl & feature, + mapnik::feature_impl &, proj_transform const& prj_trans) { path_attributes_.set_fill_color(get(sym, keys::fill, mapnik::color(128,128,128))); diff --git a/src/svg/output/process_raster_symbolizer.cpp b/src/svg/output/process_raster_symbolizer.cpp deleted file mode 100644 index b325a8223..000000000 --- a/src/svg/output/process_raster_symbolizer.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/***************************************************************************** - * - * This file is part of Mapnik (c++ mapping toolkit) - * - * Copyright (C) 2011 Artem Pavlenko - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - *****************************************************************************/ - -#if defined(SVG_RENDERER) - -// mapnik -#include - -namespace mapnik -{ -template -void svg_renderer::process(raster_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans) -{ - // nothing yet. -} - -template void svg_renderer >::process(raster_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans); -} - -#endif diff --git a/src/svg/output/process_shield_symbolizer.cpp b/src/svg/output/process_shield_symbolizer.cpp deleted file mode 100644 index db633d9e6..000000000 --- a/src/svg/output/process_shield_symbolizer.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/***************************************************************************** - * - * This file is part of Mapnik (c++ mapping toolkit) - * - * Copyright (C) 2011 Artem Pavlenko - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - *****************************************************************************/ - -#if defined(SVG_RENDERER) - -// mapnik -#include - -namespace mapnik -{ -template -void svg_renderer::process(shield_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans) -{ - // nothing yet. -} - -template void svg_renderer >::process(shield_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans); -} - -#endif diff --git a/src/svg/output/process_symbolizers.cpp b/src/svg/output/process_symbolizers.cpp index b22072973..765ec3fdf 100644 --- a/src/svg/output/process_symbolizers.cpp +++ b/src/svg/output/process_symbolizers.cpp @@ -40,15 +40,15 @@ namespace mapnik { struct symbol_type_dispatch : public util::static_visitor { template - bool operator()(Symbolizer const& sym) const + bool operator()(Symbolizer const&) const { return false; } - bool operator()(line_symbolizer const& sym) const + bool operator()(line_symbolizer const&) const { return true; } - bool operator()(polygon_symbolizer const& sym) const + bool operator()(polygon_symbolizer const&) const { return true; } diff --git a/src/svg/output/process_text_symbolizer.cpp b/src/svg/output/process_text_symbolizer.cpp deleted file mode 100644 index b21f24df1..000000000 --- a/src/svg/output/process_text_symbolizer.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/***************************************************************************** - * - * This file is part of Mapnik (c++ mapping toolkit) - * - * Copyright (C) 2011 Artem Pavlenko - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - *****************************************************************************/ - -#if defined(SVG_RENDERER) - -// mapnik -#include - -namespace mapnik -{ -template -void svg_renderer::process(text_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans) -{ - // nothing yet. -} - -template void svg_renderer >::process(text_symbolizer const& sym, - mapnik::feature_impl & feature, - proj_transform const& prj_trans); -} - -#endif diff --git a/src/svg/output/svg_renderer.cpp b/src/svg/output/svg_renderer.cpp index 22f4e1842..aeeace05f 100644 --- a/src/svg/output/svg_renderer.cpp +++ b/src/svg/output/svg_renderer.cpp @@ -82,7 +82,7 @@ void svg_renderer::start_map_processing(Map const& map) } template -void svg_renderer::end_map_processing(Map const& map) +void svg_renderer::end_map_processing(Map const&) { // generate SVG root element closing tag. generator_.generate_closing_root(); @@ -90,7 +90,7 @@ void svg_renderer::end_map_processing(Map const& map) } template -void svg_renderer::start_layer_processing(layer const& lay, box2d const& query_extent) +void svg_renderer::start_layer_processing(layer const& lay, box2d const&) { generator_.generate_opening_group(lay.name()); MAPNIK_LOG_DEBUG(svg_renderer) << "svg_renderer: Start layer processing=" << lay.name();