sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

deal with various -Wunused-parameter warnings that are not important

Browse source
This commit is contained in:
Dane Springmeyer 2013-07-23 18:46:54 -04:00
parent 827a9d147a
commit cfc977e6cd
9 changed files with 48 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/formatting/base.cpp
View file

@ -30,13 +30,15 @@
// boost
#include <boost/property_tree/ptree.hpp>
// stl
#include <stdexcept>
namespace mapnik {
namespace formatting {
void node::to_xml(boost::property_tree::ptree &xml) const
void node::to_xml(boost::property_tree::ptree & /*xml*/) const
{
//TODO: Should this throw a config_error?
MAPNIK_LOG_ERROR(base) << "Trying to write unsupported node type to XML.";
throw std::runtime_error("Trying to write unsupported node type to XML");
}
node_ptr node::from_xml(xml_node const& xml)
@ -62,7 +64,7 @@ node_ptr node::from_xml(xml_node const& xml)
}
}
void node::add_expressions(expression_set &output) const
void node::add_expressions(expression_set & /*output*/) const
{
//Do nothing by default
}

4
src/grid/grid_renderer.cpp
View file

@ -109,7 +109,7 @@ void grid_renderer<T>::start_map_processing(Map const& m)
}
template <typename T>
void grid_renderer<T>::end_map_processing(Map const& m)
void grid_renderer<T>::end_map_processing(Map const& /*m*/)
{
MAPNIK_LOG_DEBUG(grid_renderer) << "grid_renderer: End map processing";
}
@ -140,7 +140,7 @@ void grid_renderer<T>::end_layer_processing(layer const&)
}
template <typename T>
void grid_renderer<T>::render_marker(mapnik::feature_impl & feature, unsigned int step, pixel_position const& pos, marker const& marker, agg::trans_affine const& tr, double opacity, composite_mode_e comp_op)
void grid_renderer<T>::render_marker(mapnik::feature_impl & feature, unsigned int step, pixel_position const& pos, marker const& marker, agg::trans_affine const& tr, double opacity, composite_mode_e /*comp_op*/)
{
if (marker.is_vector())
{

9
src/jpeg_reader.cpp
View file

@ -178,7 +178,7 @@ void jpeg_reader<T>::skip(j_decompress_ptr cinfo, long count)
}
template <typename T>
void jpeg_reader<T>::term (j_decompress_ptr cinfo)
void jpeg_reader<T>::term (j_decompress_ptr /*cinfo*/)
{
// no-op
}
@ -203,15 +203,16 @@ void jpeg_reader<T>::attach_stream (j_decompress_ptr cinfo, input_stream* in)
}
template <typename T>
void jpeg_reader<T>::on_error(j_common_ptr cinfo)
void jpeg_reader<T>::on_error(j_common_ptr /*cinfo*/)
{
throw image_reader_exception("JPEG Reader: libjpeg could not read image");
}
template <typename T>
void jpeg_reader<T>::on_error_message(j_common_ptr cinfo)
{
// used to supress jpeg from printing to stderr
char buffer[JMSG_LENGTH_MAX];
(*cinfo->err->format_message)(cinfo, buffer);
throw image_reader_exception(std::string("JPEG Reader: libjpeg could not read image: ") + buffer);
}
template <typename T>

3
src/placement_finder.cpp
View file

@ -97,8 +97,7 @@ double get_total_distance(T & shape_path)
}
template <typename DetectorT>
placement_finder<DetectorT>::placement_finder(feature_impl const& feature,
text_placement_info const& placement_info,
placement_finder<DetectorT>::placement_finder(text_placement_info const& placement_info,
string_info const& info,
DetectorT & detector,
box2d<double> const& extent)

4
src/png_reader.cpp
View file

@ -96,12 +96,12 @@ const bool registered2 = register_image_reader("png", create_png_reader2);
}
void user_error_fn(png_structp png_ptr, png_const_charp error_msg)
void user_error_fn(png_structp /*png_ptr*/, png_const_charp error_msg)
{
throw image_reader_exception(std::string("failed to read invalid png: '") + error_msg + "'");
}
void user_warning_fn(png_structp png_ptr, png_const_charp warning_msg)
void user_warning_fn(png_structp /*png_ptr*/, png_const_charp warning_msg)
{
MAPNIK_LOG_DEBUG(png_reader) << "libpng warning: '" << warning_msg << "'";
}

42
src/save_map.cpp
View file

@ -190,8 +190,7 @@ public:
if (sym.get_colorizer())
{
serialize_raster_colorizer(sym_node, sym.get_colorizer(),
explicit_defaults_);
serialize_raster_colorizer(sym_node, sym.get_colorizer());
}
boost::optional<bool> premultiplied = sym.premultiplied();
@ -352,13 +351,16 @@ public:
}
template <typename Symbolizer>
#ifdef MAPNIK_DEBUG
void operator () ( Symbolizer const& sym)
{
// not-supported
#ifdef MAPNIK_DEBUG
MAPNIK_LOG_WARN(save_map) << typeid(sym).name() << " is not supported";
#endif
}
#else
void operator () ( Symbolizer const& /*sym*/)
{
}
#endif
private:
serialize_symbolizer();
@ -394,16 +396,23 @@ private:
}
void serialize_raster_colorizer(ptree & sym_node,
raster_colorizer_ptr const& colorizer,
bool explicit_defaults)
raster_colorizer_ptr const& colorizer)
{
ptree & col_node = sym_node.push_back(
ptree::value_type("RasterColorizer", ptree() ))->second;
set_attr(col_node, "default-mode", colorizer->get_default_mode());
set_attr(col_node, "default-color", colorizer->get_default_color());
set_attr(col_node, "epsilon", colorizer->get_epsilon());
raster_colorizer dfl;
if (colorizer->get_default_mode() != dfl.get_default_mode() || explicit_defaults_)
{
set_attr(col_node, "default-mode", colorizer->get_default_mode());
}
if (colorizer->get_default_color() != dfl.get_default_color() || explicit_defaults_)
{
set_attr(col_node, "default-color", colorizer->get_default_color());
}
if (colorizer->get_epsilon() != dfl.get_epsilon() || explicit_defaults_)
{
set_attr(col_node, "epsilon", colorizer->get_epsilon());
}
unsigned i;
colorizer_stops const &stops = colorizer->get_stops();
for (i=0; i<stops.size(); i++) {
@ -414,7 +423,6 @@ private:
if (stops[i].get_label()!=std::string(""))
set_attr(stop_node, "label", stops[i].get_label());
}
}
void add_image_attributes(ptree & node, symbolizer_with_image const& sym)
@ -673,22 +681,22 @@ public:
serialize_type( boost::property_tree::ptree & node):
node_(node) {}
void operator () ( mapnik::value_integer val ) const
void operator () ( mapnik::value_integer /*val*/ ) const
{
node_.put("<xmlattr>.type", "int" );
}
void operator () ( mapnik::value_double val ) const
void operator () ( mapnik::value_double /*val*/ ) const
{
node_.put("<xmlattr>.type", "float" );
}
void operator () ( std::string const& val ) const
void operator () ( std::string const& /*val*/ ) const
{
node_.put("<xmlattr>.type", "string" );
}
void operator () ( mapnik::value_null val ) const
void operator () ( mapnik::value_null /*val*/ ) const
{
node_.put("<xmlattr>.type", "string" );
}

4
src/svg/output/process_line_symbolizer.cpp
View file

@ -30,8 +30,8 @@ namespace mapnik
*/
template <typename T>
void svg_renderer<T>::process(line_symbolizer const& sym,
mapnik::feature_impl & feature,
proj_transform const& prj_trans)
mapnik::feature_impl & /*feature*/,
proj_transform const& /*prj_trans*/)
{
path_attributes_.set_stroke_color(sym.get_stroke().get_color());
path_attributes_.set_stroke_opacity(sym.get_stroke().get_opacity());

2
src/symbolizer_helpers.cpp
View file

@ -330,7 +330,7 @@ bool text_symbolizer_helper<FaceManagerT, DetectorT>::next_placement()
angle_ = 0.0;
}
finder_.reset(new placement_finder<DetectorT>(feature_, *placement_,
finder_.reset(new placement_finder<DetectorT>(*placement_,
text_.get_string_info(),
detector_, dims_));
placement_valid_ = true;

8
src/tiff_reader.cpp
View file

@ -61,7 +61,7 @@ static toff_t tiff_seek_proc(thandle_t fd, toff_t off, int whence)
return static_cast<toff_t>(in->tellg());
}
static int tiff_close_proc(thandle_t fd)
static int tiff_close_proc(thandle_t /*fd*/)
{
return 0;
}
@ -86,16 +86,16 @@ static tsize_t tiff_read_proc(thandle_t fd, tdata_t buf, tsize_t size)
return static_cast<tsize_t>(in->gcount());
}
static tsize_t tiff_write_proc(thandle_t fd, tdata_t buf, tsize_t size)
static tsize_t tiff_write_proc(thandle_t /*fd*/, tdata_t /*buf*/, tsize_t /*size*/)
{
return 0;
}
static void tiff_unmap_proc(thandle_t fd, tdata_t base, toff_t size)
static void tiff_unmap_proc(thandle_t /*fd*/, tdata_t /*base*/, toff_t /*size*/)
{
}
static int tiff_map_proc(thandle_t fd, tdata_t* pbase, toff_t* psize)
static int tiff_map_proc(thandle_t /*fd*/, tdata_t* /*pbase*/, toff_t* /*psize*/)
{
return 0;
}